Permalink
Browse files

Merge branch 'MDL-38912_23' of git://github.com/timhunt/moodle into M…

…OODLE_23_STABLE
  • Loading branch information...
2 parents 1b9d0b9 + d4aac8e commit f3da6ac7aaf532d82b05d351dcc33f60c4fde5a0 @stronk7 stronk7 committed Apr 8, 2013
Showing with 8 additions and 0 deletions.
  1. +8 −0 lib/phpunit/classes/util.php
@@ -587,6 +587,14 @@ public static function reset_all_data($logchanges = false) {
if ($COURSE->id != $oldsite->id) {
$warnings[] = 'Warning: unexpected change of $COURSE';
}
+
+ if (ini_get('max_execution_time') != 0) {
+ // TODO un-comment this warning, once we have fixed the test
+ // failures that it causes.
+ // $warnings[] = 'Warning: max_execution_time was changed.';
+ // See MDL-38989 for details.
+ set_time_limit(0);
+ }
}
// restore original globals

0 comments on commit f3da6ac

Please sign in to comment.