Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #512104 by boombatower: simpletest breaks high volume sites.

merge-requests/26/head
Dries Buytaert 2009-07-07 07:52:32 +00:00
parent d258bed22a
commit 67fb78ce12
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/simpletest/drupal_web_test_case.php
View File

@ -1076,7 +1076,7 @@ class DrupalWebTestCase extends DrupalTestCase {
variable_set('smtp_library', drupal_get_path('module', 'simpletest') . '/drupal_web_test_case.php'); variable_set('smtp_library', drupal_get_path('module', 'simpletest') . '/drupal_web_test_case.php');
// Use temporary files directory with the same prefix as database. // Use temporary files directory with the same prefix as database.
variable_set('file_directory_path', $this->originalFileDirectory . '/' . $db_prefix); variable_set('file_directory_path', $this->originalFileDirectory . '/simpletest/' . substr($db_prefix, 10));
$directory = file_directory_path(); $directory = file_directory_path();
// Create the files directory. // Create the files directory.
file_check_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS); file_check_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS);

7
modules/simpletest/simpletest.module
View File

@ -360,11 +360,12 @@ function simpletest_clean_database() {
* Find all leftover temporary directories and remove them. * Find all leftover temporary directories and remove them.
*/ */
function simpletest_clean_temporary_directories() { function simpletest_clean_temporary_directories() {
$files = scandir(file_directory_path()); $directory = file_directory_path() . '/simpletest';
$files = scandir($directory);
$count = 0; $count = 0;
foreach ($files as $file) { foreach ($files as $file) {
$path = file_directory_path() . '/' . $file; $path = "$directory/$file";
if (is_dir($path) && preg_match('/^simpletest\d+/', $file)) { if (is_dir($path) && is_numeric($file)) {
file_unmanaged_delete_recursive($path); file_unmanaged_delete_recursive($path);
$count++; $count++;
} }