diff --git a/modules/simpletest/tests/file.test b/modules/simpletest/tests/file.test index f4e9cf8..6a9794f 100644 --- a/modules/simpletest/tests/file.test +++ b/modules/simpletest/tests/file.test @@ -899,7 +899,7 @@ class FileDirectoryTest extends FileTestCase { * Test local directory handling functions. */ function testFileCheckLocalDirectoryHandling() { - $directory = conf_path() . '/files'; + $directory = file_default_scheme() . '://'; // Check a new recursively created local directory for correct file system // permissions. @@ -907,18 +907,18 @@ class FileDirectoryTest extends FileTestCase { $child = $this->randomName(); // Files directory already exists. - $this->assertTrue(is_dir($directory), t('Files directory already exists.'), 'File'); + $this->assertTrue(is_dir($directory), 'Files directory already exists.', 'File'); // Make files directory writable only. $old_mode = fileperms($directory); // Create the directories. $parent_path = $directory . DIRECTORY_SEPARATOR . $parent; $child_path = $parent_path . DIRECTORY_SEPARATOR . $child; - $this->assertTrue(drupal_mkdir($child_path, 0775, TRUE), t('No error reported when creating new local directories.'), 'File'); + $this->assertTrue(drupal_mkdir($child_path, 0775, TRUE), 'No error reported when creating new local directories.', 'File'); // Ensure new directories also exist. - $this->assertTrue(is_dir($parent_path), t('New parent directory actually exists.'), 'File'); - $this->assertTrue(is_dir($child_path), t('New child directory actually exists.'), 'File'); + $this->assertTrue(is_dir($parent_path), 'New parent directory actually exists.', 'File'); + $this->assertTrue(is_dir($child_path), 'New child directory actually exists.', 'File'); // Check that new directory permissions were set properly. $this->assertDirectoryPermissions($parent_path, 0775);