Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MDL-38912 fix incorrect timeout reset

  • Loading branch information...
commit b93ca5a53d5a9eadf7aaa93ed4b3a71c3858940e 1 parent 650e014
@skodak skodak authored stronk7 committed
Showing with 10 additions and 7 deletions.
  1. +10 −7 lib/phpunit/classes/util.php
View
17 lib/phpunit/classes/util.php
@@ -588,13 +588,16 @@ public static function reset_all_data($logchanges = false) {
$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);
- }
+ }
+
+ if (ini_get('max_execution_time') != 0) {
+ // This is special warning for all resets because we do not want any
+ // libraries to mess with timeouts unintentionally.
+ // Our PHPUnit integration is not supposed to change it either.
+
+ // TODO: MDL-38912 uncomment and fix all + somehow resolve timeouts in failed tests.
+ //$warnings[] = 'Warning: max_execution_time was changed.';
+ set_time_limit(0);
}
// restore original globals
Please sign in to comment.
Something went wrong with that request. Please try again.