diff options
Diffstat (limited to 'modules/simpletest/drupal_web_test_case.php')
| -rw-r--r-- | modules/simpletest/drupal_web_test_case.php | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php index 1946e5dc3..2f5c5b083 100644 --- a/modules/simpletest/drupal_web_test_case.php +++ b/modules/simpletest/drupal_web_test_case.php @@ -1079,12 +1079,17 @@ class DrupalWebTestCase extends DrupalTestCase { // Create test directory ahead of installation so fatal errors and debug // information can be logged during installation process. - $directory = $this->originalFileDirectory . '/simpletest/' . substr($db_prefix, 10); - file_prepare_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS); + // Use temporary files directory with the same prefix as the database. + $public_files_directory = $this->originalFileDirectory . '/simpletest/' . substr($db_prefix, 10); + $private_files_directory = $public_files_directory . '/private'; + + // Create the directories + file_prepare_directory($public_files_directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS); + file_prepare_directory($private_files_directory, FILE_CREATE_DIRECTORY); // Log fatal errors. ini_set('log_errors', 1); - ini_set('error_log', $directory . '/error.log'); + ini_set('error_log', $public_files_directory . '/error.log'); // Reset all statics so that test is performed with a clean environment. drupal_static_reset(); @@ -1142,21 +1147,12 @@ class DrupalWebTestCase extends DrupalTestCase { unset($GLOBALS['conf']['language_default']); $language = language_default(); - // Use the test mail class instead of the default mail handler class. - variable_set('mail_system', array('default-system' => 'TestingMailSystem')); - - // Use temporary files directory with the same prefix as the database. - $public_files_directory = $this->originalFileDirectory . '/' . $db_prefix; - $private_files_directory = $public_files_directory . '/private'; - // Set path variables variable_set('file_public_path', $public_files_directory); variable_set('file_private_path', $private_files_directory); - // Create the directories - $directory = file_directory_path('public'); - file_prepare_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS); - file_prepare_directory($private_files_directory, FILE_CREATE_DIRECTORY); + // Use the test mail class instead of the default mail handler class. + variable_set('mail_system', array('default-system' => 'TestingMailSystem')); drupal_set_time_limit($this->timeLimit); } @@ -1211,7 +1207,7 @@ class DrupalWebTestCase extends DrupalTestCase { if (preg_match('/simpletest\d+/', $db_prefix)) { // Delete temporary files directory. - file_unmanaged_delete_recursive($this->originalFileDirectory . '/' . $db_prefix); + file_unmanaged_delete_recursive($this->originalFileDirectory . '/simpletest/' . substr($db_prefix, 10)); // Remove all prefixed tables (all the tables in the schema). $schema = drupal_get_schema(NULL, TRUE); |