Merge branch 'wip-mdl-45204-m' of git://github.com/rajeshtaneja/moodle

2014-11-03 17:03:57 +08:00
parent b7f75a9c05 54957bdbf7
commit d9fb78c981
1 changed files with 3 additions and 0 deletions
@@ -155,6 +155,9 @@ class core_setuplib_testcase extends advanced_testcase {
        $this->setCurrentTimeStart();
        $timestampfile = "$CFG->localcachedir/.lastpurged";

+        // Delete existing localcache directory, as this is testing first call
+        // to make_localcache_directory.
+        remove_dir($CFG->localcachedir, true);
        $dir = make_localcache_directory('', false);
        $this->assertSame($CFG->localcachedir, $dir);
        $this->assertFileNotExists("$CFG->localcachedir/.htaccess");