L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-38912 fix incorrect timeout reset

Browse Source
This commit is contained in:
Petr Škoda
2013-04-10 00:06:34 +02:00
committed by Eloy Lafuente (stronk7)
parent e6c7a5887b
commit 70faad655a
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/phpunit/classes/util.php
+10 -7
View File
@@ -140,13 +140,16 @@ class phpunit_util extends testing_util {
$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