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

jblotus · Nov 3, 2014 · d9fb78c · d9fb78c
2 parents b7f75a9 + 54957bd
commit d9fb78c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/lib/tests/setuplib_test.php b/lib/tests/setuplib_test.php
@@ -155,6 +155,9 @@ public function test_localcachedir() {
         $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");