summaryrefslogtreecommitdiff
path: root/modules/simpletest
diff options
context:
space:
mode:
Diffstat (limited to 'modules/simpletest')
-rw-r--r--modules/simpletest/drupal_web_test_case.php2
-rw-r--r--modules/simpletest/tests/file_test.module4
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index bf8e8e78d..398e63d0b 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -1175,7 +1175,7 @@ class DrupalWebTestCase extends DrupalTestCase {
if (preg_match('/simpletest\d+/', $db_prefix)) {
// Delete temporary files directory.
- file_unmanaged_delete_recursive(file_directory_path());
+ file_unmanaged_delete_recursive($this->originalFileDirectory . '/' . $db_prefix);
// Remove all prefixed tables (all the tables in the schema).
$schema = drupal_get_schema(NULL, TRUE);
diff --git a/modules/simpletest/tests/file_test.module b/modules/simpletest/tests/file_test.module
index 567508a4f..e9d4ce1f8 100644
--- a/modules/simpletest/tests/file_test.module
+++ b/modules/simpletest/tests/file_test.module
@@ -221,8 +221,8 @@ function file_test_file_validate($file) {
/**
* Implement hook_file_download().
*/
-function file_test_file_download($file) {
- _file_test_log_call('download', array($file));
+function file_test_file_download($uri) {
+ _file_test_log_call('download', array($uri));
return _file_test_get_return('download');
}