moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	lib/phpunit/classes/util.php
This commit is contained in:
Eloy Lafuente (stronk7) 2014-03-13 19:12:25 +01:00
commit 1700bec3c6
3 changed files with 161 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/phpunit/classes/util.php Normal file → Executable file
View file

@ -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);