Made a few updates to re-wire the timeout value from the command line…

… into the Job script generator
padraic · Jan 30, 2012 · 89716eb · 89716eb
1 parent ea560aa
commit 89716eb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/library/Mutagenesis/Adapter/Phpunit.php b/library/Mutagenesis/Adapter/Phpunit.php
@@ -72,9 +72,9 @@ public function runTests(\Mutagenesis\Runner\Base $runner, $useStdout = true,
                     $job->generate(
                         $mutation,
                         $args,
+                        $runner->getTimeout(),
                         $runner->getBootstrap()
-                    ),
-                    $runner->getTimeout()
+                    )
                 );
                 if (!$this->processOutput($output['stdout'])) {
                     return array(false, $output);
@@ -85,9 +85,14 @@ public function runTests(\Mutagenesis\Runner\Base $runner, $useStdout = true,
                 $job->generate(
                     $mutation,
                     $options,
+                    /**
+                     * We don't want the initial test run to time out because it
+                     * executes all tests in a single process for PHPUnit (though
+                     * PHPUnit may use parallel processes internally).
+                     */
+                    0,
                     $runner->getBootstrap()
-                ),
-                $runner->getTimeout()
+                )
             );
             if (!$this->processOutput($output['stdout'])) {
                 return array(false, $output);
@@ -102,9 +107,9 @@ public function runTests(\Mutagenesis\Runner\Base $runner, $useStdout = true,
      * @param string $jobScript
      * @return string $output
      */
-    public static function execute($jobScript, $timeout = 120)
+    public static function execute($jobScript)
     {
-        $output = \Mutagenesis\Utility\Process::run($jobScript, $timeout);
+        $output = \Mutagenesis\Utility\Process::run($jobScript);
         return $output;
     }
 

diff --git a/library/Mutagenesis/Runner/RunnerAbstract.php b/library/Mutagenesis/Runner/RunnerAbstract.php
@@ -133,11 +133,11 @@ abstract class RunnerAbstract
     protected $_options = array();
 
     /**
-     * Timeout in seconds allowed per test execution
+     * Timeout in seconds allowed per test execution.
      *
      * @var int
      */
-    protected $_timeout = 120;
+    protected $_timeout = 60;
 
     /**
      * Test framework bootstrap

diff --git a/library/Mutagenesis/Utility/Job.php b/library/Mutagenesis/Utility/Job.php
@@ -30,7 +30,7 @@ class Job
      * @param array $mutation Mutation data and objects to be used
      * @return string
      */
-    public function generate(array $mutation = array(), array $args = array(), $bootstrap = null)
+    public function generate(array $mutation = array(), array $args = array(), $timeout = 60, $bootstrap = null)
     {
         $serializedArgs = addslashes(serialize($args));
         $serializedMutation = addslashes(serialize($mutation));
@@ -60,7 +60,7 @@ static function timeout() {
     }
 }
 pcntl_signal(SIGALRM, array('\\MutagenesisEnv\\Job', 'timeout'), TRUE);
-pcntl_alarm(120);
+pcntl_alarm({$timeout});
 try {
     Job::main();
 } catch (\\Exception \$e) {

diff --git a/tests/Mutagenesis/Utility/JobTest.php b/tests/Mutagenesis/Utility/JobTest.php
@@ -49,7 +49,7 @@ static function timeout() {
     }
 }
 pcntl_signal(SIGALRM, array('\\MutagenesisEnv\\Job', 'timeout'), TRUE);
-pcntl_alarm(120);
+pcntl_alarm(60);
 try {
     Job::main();
 } catch (\\Exception \$e) {