From 3f1e87973fea294f04be642d7f9e1a89ceb20897 Mon Sep 17 00:00:00 2001
From: Petr Skoda <commits@skodak.org>
Date: Sat, 7 Apr 2012 19:56:24 +0200
Subject: [PATCH] MDL-32323 always create test dirs using standard functions
 and close handles before delete

---
 backup/util/loggers/simpletest/testlogger.php | 2 ++
 backup/util/loggers/tests/logger_test.php     | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/backup/util/loggers/simpletest/testlogger.php b/backup/util/loggers/simpletest/testlogger.php
index 9374346ae93..c4f49fec0e6 100644
--- a/backup/util/loggers/simpletest/testlogger.php
+++ b/backup/util/loggers/simpletest/testlogger.php
@@ -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));
diff --git a/backup/util/loggers/tests/logger_test.php b/backup/util/loggers/tests/logger_test.php
index 799632ff0b9..67f8e7472c6 100644
--- a/backup/util/loggers/tests/logger_test.php
+++ b/backup/util/loggers/tests/logger_test.php
@@ -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, '&nbsp;&nbsp;') !== 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));