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

2014-03-12 23:26:25 +01:00
parent ff189a25a9 8efc71b90c
commit 3dd695bce0
3 changed files with 161 additions and 13 deletions
@@ -384,6 +384,10 @@ class phpunit_util extends testing_util {

        install_cli_database($options, false);

+        // 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);