allowing \test\Controller timeout to be set via params.

UnionOfRAD · Feb 10, 2011 · 0a74653 · 0a74653
1 parent fd09a84
commit 0a74653
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/libraries/lithium/test/Controller.php b/libraries/lithium/test/Controller.php
@@ -30,22 +30,22 @@ class Controller extends \lithium\core\Object {
 	public function __invoke($request, $dispatchParams, array $options = array()) {
 		$dispatchParamsDefaults = array('args' => array());
 		$dispatchParams += $dispatchParamsDefaults;
-		$defaults = array('reporter' => 'html', 'format' => 'html');
+		$defaults = array('reporter' => 'html', 'format' => 'html', 'timeout' => 0);
 		$options += (array) $request->query + $defaults;
 		$params = compact('request', 'dispatchParams', 'options');
-		set_time_limit(0);
 
 		return $this->_filter(__METHOD__, $params, function($self, $params) {
 			$request = $params['request'];
 			$options = $params['options'];
 			$params = $params['dispatchParams'];
+			set_time_limit((integer) $options['timeout']);
 			$group = join('\\', (array) $params['args']);
 
 			if ($group === "all") {
 				$group = Group::all();
 				$options['title'] = 'All Tests';
 			}
-			$report = Dispatcher::run($group , $options);
+			$report = Dispatcher::run($group, $options);
 			$filters = Libraries::locate('test.filter');
 			$menu = Libraries::locate('tests', null, array(
 				'filter' => '/cases|integration|functional/',