Adds improved verbosity output.

paratestphp · Jan 25, 2019 · 96a2bb0 · 96a2bb0
1 parent 9b07f10
commit 96a2bb0
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 21 deletions.
diff --git a/src/Runners/PHPUnit/BaseRunner.php b/src/Runners/PHPUnit/BaseRunner.php
@@ -39,7 +39,7 @@ abstract class BaseRunner
      * A collection of ExecutableTest objects that have processes
      * currently running.
      *
-     * @var array
+     * @var array|ExecutableTest[]
      */
     protected $running = [];
 

diff --git a/src/Runners/PHPUnit/Runner.php b/src/Runners/PHPUnit/Runner.php
@@ -31,9 +31,19 @@ public function run()
 
         while (\count($this->running) || \count($this->pending)) {
             foreach ($this->running as $key => $test) {
-                if (!$this->testIsStillRunning($test)) {
-                    unset($this->running[$key]);
-                    $this->releaseToken($key);
+                try {
+                    if (!$this->testIsStillRunning($test)) {
+                        unset($this->running[$key]);
+                        $this->releaseToken($key);
+                    }
+                } catch (\Exception $e) {
+                    if ($this->options->verbose) {
+                        echo "An error for $key: {$e->getMessage()}" . PHP_EOL;
+                        echo "Command: {$test->getLastCommand()}" . PHP_EOL;
+                        echo 'StdErr: ' . $test->getStderr() . PHP_EOL;
+                        echo 'StdOut: ' . $test->getStdout() . PHP_EOL;
+                    }
+                    throw $e;
                 }
             }
             $this->fillRunQueue();

diff --git a/src/Runners/PHPUnit/Worker/BaseWorker.php b/src/Runners/PHPUnit/Worker/BaseWorker.php
@@ -94,18 +94,22 @@ public function isCrashed(): bool
     public function checkNotCrashed()
     {
         if ($this->isCrashed()) {
-            $lastCommand = isset($this->commands) ? ' Last executed command: ' . end($this->commands) : '';
-            throw new \RuntimeException(
-                'This worker has crashed.' . $lastCommand . PHP_EOL
-                . 'Output:' . PHP_EOL
-                . '----------------------' . PHP_EOL
-                . $this->alreadyReadOutput . PHP_EOL
-                . '----------------------' . PHP_EOL
-                . $this->readAllStderr()
-            );
+            throw new \RuntimeException($this->getCrashReport());
         }
     }
 
+    public function getCrashReport()
+    {
+        $lastCommand = isset($this->commands) ? ' Last executed command: ' . end($this->commands) : '';
+
+        return 'This worker has crashed.' . $lastCommand . PHP_EOL
+            . 'Output:' . PHP_EOL
+            . '----------------------' . PHP_EOL
+            . $this->alreadyReadOutput . PHP_EOL
+            . '----------------------' . PHP_EOL
+            . $this->readAllStderr();
+    }
+
     public function stop()
     {
         fclose($this->pipes[0]);

diff --git a/src/Runners/PHPUnit/Worker/WrapperWorker.php b/src/Runners/PHPUnit/Worker/WrapperWorker.php
@@ -44,6 +44,7 @@ public function assign(ExecutableTest $test, string $phpunit, array $phpunitOpti
         if ($options->verbose) {
             echo "\nExecuting test via: $command\n";
         }
+        $test->setLastCommand($command);
         $this->execute($command);
     }
 

diff --git a/src/Runners/PHPUnit/WrapperRunner.php b/src/Runners/PHPUnit/WrapperRunner.php
@@ -70,12 +70,21 @@ private function assignAllPendingTests()
         // $phpunitOptions['no-globals-backup'] = null;  // removed in phpunit 6.0
         while (\count($this->pending)) {
             $this->waitForStreamsToChange($this->streams);
-            foreach ($this->progressedWorkers() as $worker) {
+            foreach ($this->progressedWorkers() as $key => $worker) {
                 if ($worker->isFree()) {
-                    $this->flushWorker($worker);
-                    $pending = array_shift($this->pending);
-                    if ($pending) {
-                        $worker->assign($pending, $phpunit, $phpunitOptions, $this->options);
+                    try {
+                        $this->flushWorker($worker);
+                        $pending = array_shift($this->pending);
+                        if ($pending) {
+                            $worker->assign($pending, $phpunit, $phpunitOptions, $this->options);
+                        }
+                    } catch (\Exception $e) {
+                        if ($this->options->verbose) {
+                            $worker->stop();
+                            echo "Error while assigning pending tests for worker $key: {$e->getMessage()}" . PHP_EOL;
+                            echo $worker->getCrashReport();
+                        }
+                        throw $e;
                     }
                 }
             }
@@ -96,9 +105,19 @@ private function waitForAllToFinish()
             $toCheck = $this->streamsOf($toStop);
             $new = $this->waitForStreamsToChange($toCheck);
             foreach ($this->progressedWorkers() as $index => $worker) {
-                if (!$worker->isRunning()) {
-                    $this->flushWorker($worker);
-                    unset($toStop[$index]);
+                try {
+                    if (!$worker->isRunning()) {
+                        $this->flushWorker($worker);
+                        unset($toStop[$index]);
+                    }
+                } catch (\Exception $e) {
+                    if ($this->options->verbose) {
+                        $worker->stop();
+                        unset($toStop[$index]);
+                        echo "Error while waiting to finish for worker $index: {$e->getMessage()}" . PHP_EOL;
+                        echo $worker->getCrashReport();
+                    }
+                    throw $e;
                 }
             }
         }