summaryrefslogtreecommitdiff
path: root/modules/unit_test
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-12-15 11:17:22 -0800
committerBharat Mediratta <bharat@menalto.com>2010-12-15 11:17:22 -0800
commit587284ab38a78580c4ce83735fb563aa9951e701 (patch)
treedab9cbb2fe785f42b2a5a52014147a42ca36b75b /modules/unit_test
parent79740a2c77ad5c9b048e094cc164fd0129aba16a (diff)
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.
Diffstat (limited to 'modules/unit_test')
-rw-r--r--modules/unit_test/libraries/Unit_Test.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/unit_test/libraries/Unit_Test.php b/modules/unit_test/libraries/Unit_Test.php
index 46a926d8..253d6fb6 100644
--- a/modules/unit_test/libraries/Unit_Test.php
+++ b/modules/unit_test/libraries/Unit_Test.php
@@ -185,6 +185,8 @@ class Unit_Test_Core {
$e = null;
try {
+ // Enforce a time limit
+ set_time_limit(30);
// Run the actual test
$object->$method_name();