Merge branch 'MDL-43266_master-last-fixes' of git://github.com/dmonllao/moodle

Conflicts: lib/phpunit/classes/util.php
2014-03-13 19:12:25 +01:00
parent ad246c2d2c d3daf24563
commit 1700bec3c6
3 changed files with 161 additions and 13 deletions
@@ -387,6 +387,10 @@ class phpunit_util extends testing_util {
        // Disable all logging for performance and sanity reasons.
        set_config('enabled_stores', '', 'tool_log');

+        // We need to keep the installed dataroot filedir files.
+        // So each time we reset the dataroot before running a test, the default files are still installed.
+        self::save_original_data_files();
+
        // install timezone info
        $timezones = get_records_csv($CFG->libdir.'/timezone.txt', 'timezone');
        update_timezone_records($timezones);