Permalink
Browse files

Move the test time limit code into Unit_Test since some parts of the

code (like ORM_MPTT) mess with the time limit which interferes with
the overall time limit set in Gallery_Unit_Test_Controller.
  • Loading branch information...
1 parent 79740a2 commit 587284ab38a78580c4ce83735fb563aa9951e701 @bharat bharat committed Dec 15, 2010
@@ -132,7 +132,6 @@ function index() {
graphics::choose_default_toolkit();
$filter = count($_SERVER["argv"]) > 2 ? $_SERVER["argv"][2] : null;
- set_time_limit(300);
print new Unit_Test($modules, $filter);
} catch (ORM_Validation_Exception $e) {
print "Validation Exception: {$e->getMessage()}\n";
@@ -185,6 +185,8 @@ public function __construct($extra_paths=array(), $filter=null)
$e = null;
try {
+ // Enforce a time limit
+ set_time_limit(30);
// Run the actual test
$object->$method_name();

0 comments on commit 587284a

Please sign in to comment.