From 1a095dd60231adcff8e895ac9f70105d2a4b8039 Mon Sep 17 00:00:00 2001 From: catch Date: Sat, 7 Apr 2012 11:40:36 +0900 Subject: [PATCH] Issue #1512676 by swentel: Fixed Simpletest doesn't clean up the config directories generated by the configuration . --- core/modules/simpletest/drupal_web_test_case.php | 3 +++ core/modules/simpletest/simpletest.module | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/modules/simpletest/drupal_web_test_case.php b/core/modules/simpletest/drupal_web_test_case.php index 0a313ef2b96..7163739745b 100644 --- a/core/modules/simpletest/drupal_web_test_case.php +++ b/core/modules/simpletest/drupal_web_test_case.php @@ -1547,6 +1547,9 @@ class DrupalWebTestCase extends DrupalTestCase { // Delete temporary files directory. file_unmanaged_delete_recursive($this->originalFileDirectory . '/simpletest/' . substr($this->databasePrefix, 10)); + // Delete temporary config files directory. + file_unmanaged_delete_recursive($this->originalFileDirectory . '/simpletest/config_simpletest' . substr($this->databasePrefix, 10)); + // Remove all prefixed tables (all the tables in the schema). $schema = drupal_get_schema(NULL, TRUE); foreach ($schema as $name => $table) { diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module index b21c64ce933..cbc946cf7bf 100644 --- a/core/modules/simpletest/simpletest.module +++ b/core/modules/simpletest/simpletest.module @@ -459,7 +459,7 @@ function simpletest_clean_temporary_directories() { $files = scandir('public://simpletest'); foreach ($files as $file) { $path = 'public://simpletest/' . $file; - if (is_dir($path) && is_numeric($file)) { + if (is_dir($path) && (is_numeric($file) || strpos($file, 'config_simpletest') !== FALSE)) { file_unmanaged_delete_recursive($path); $count++; }