Merge branch 'MDL-43266_master-last-fixes' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Mar 2014 18:12:25 +0000 (19:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Mar 2014 18:12:25 +0000 (19:12 +0100)
Conflicts:
lib/phpunit/classes/util.php

1  2 
lib/phpunit/classes/util.php

index 3c546d5,ed8d632..c1c3b04
mode 100644,100755..100755
@@@ -384,9 -384,10 +384,13 @@@ class phpunit_util extends testing_uti
  
          install_cli_database($options, false);
  
 +        // 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);