L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-32323 always create test dirs using standard functions and close handles before delete

Browse Source
This commit is contained in:
Petr Skoda
2012-04-10 15:27:07 +02:00
parent bd4d412a10
commit 3f1e87973f
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/util/loggers/simpletest/testlogger.php
+2
View File
@@ -272,6 +272,7 @@ class logger_test extends UnitTestCase {
unlink($file); // delete file
// Try one html file
check_dir_exists($CFG->tempdir . '/test');
$file = $CFG->tempdir . '/test/test_file_logger.html';
$options = array('depth' => 1);
$lo = new file_logger(backup::LOG_ERROR, true, true, $file);
@@ -289,6 +290,7 @@ class logger_test extends UnitTestCase {
unlink($file); // delete file
// Instantiate, write something, force deletion, try to write again
check_dir_exists($CFG->tempdir . '/test');
$file = $CFG->tempdir . '/test/test_file_logger.html';
$lo = new mock_file_logger(backup::LOG_ERROR, true, true, $file);
$this->assertTrue(file_exists($file));
backup/util/loggers/tests/logger_test.php
+3
View File
@@ -267,6 +267,7 @@ class backup_logger_testcase extends basic_testcase {
unlink($file); // delete file
// Try one html file
check_dir_exists($CFG->tempdir . '/test');
$file = $CFG->tempdir . '/test/test_file_logger.html';
$options = array('depth' => 1);
$lo = new file_logger(backup::LOG_ERROR, true, true, $file);
@@ -281,9 +282,11 @@ class backup_logger_testcase extends basic_testcase {
$this->assertTrue(strpos($fcontents, '[error]') !== false);
$this->assertTrue(strpos($fcontents, '  ') !== false);
$this->assertTrue(substr_count($fcontents , '] ') >= 2);
$lo->__destruct(); // closes file handle
unlink($file); // delete file
// Instantiate, write something, force deletion, try to write again
check_dir_exists($CFG->tempdir . '/test');
$file = $CFG->tempdir . '/test/test_file_logger.html';
$lo = new mock_file_logger(backup::LOG_ERROR, true, true, $file);
$this->assertTrue(file_exists($file));