Support PHPUnit its --only-repeat-failed option

src/ParaTest/Console/Commands/ParaTestCommand.php

@@ -43,7 +43,10 @@ protected function configure()
             ->addOption('coverage-html', null, InputOption::VALUE_REQUIRED, 'Generate code coverage report in HTML format.')
             ->addOption('coverage-php', null, InputOption::VALUE_REQUIRED, 'Serialize PHP_CodeCoverage object to file.')
             ->addOption('max-batch-size', 'm', InputOption::VALUE_REQUIRED, 'Max batch size (only for functional mode).', 0)
-            ->addOption('filter', null, InputOption::VALUE_REQUIRED, 'Filter (only for functional mode).');
+            ->addOption('filter', null, InputOption::VALUE_REQUIRED, 'Filter (only for functional mode).')
+            ->addOption('repeat', null, InputOption::VALUE_REQUIRED, 'Runs the test(s) repeatedly.', 1)
+            ->addOption('only-repeat-failed', null, InputOption::VALUE_NONE, 'Repeat only failing tests.', null);
+
 
         if (self::isWhitelistSupported()) {
             $this->addOption('whitelist', null, InputOption::VALUE_REQUIRED, 'Directory to add to the coverage whitelist.');

src/ParaTest/Console/Testers/PHPUnit.php

@@ -1,4 +1,4 @@
-<?php 
+<?php
 namespace ParaTest\Console\Testers;
 
 use Symfony\Component\Console\Command\Command;
@@ -80,8 +80,19 @@ public function execute(InputInterface $input, OutputInterface $output)
             $runner = new Runner($this->getRunnerOptions($input));
         }
 
-        $runner->run();
-        return $runner->getExitCode();
+        // Allow the tests to be repeated.
+        $statusCode = 0;
+        $repeat = $input->getOption('repeat') ?: 1;
+        for ($i = 0; $i < $repeat; $i++) {
+            $runner->run();
+            $status = $runner->getExitCode();
+            $statusCode = $status ? $status : $statusCode;
+        }
+
+        // Print all messages at the end.
+        $runner->complete();
+
+        return $statusCode;
     }
 
     /**

src/ParaTest/Runners/PHPUnit/BaseRunner.php

@@ -41,6 +41,14 @@ abstract class BaseRunner
      */
     protected $running = array();
 
+    /**
+     * A collection of ExecutableTest objects that have already been completed
+     * and were successful.
+     *
+     * @var array
+     */
+    public $succeeded = array();
+
     /**
      * A tallied exit code that returns the highest exit
      * code returned out of the entire collection of tests
@@ -56,6 +64,13 @@ abstract class BaseRunner
      */
     protected $coverage = null;
 
+    /**
+     * Indicates whether the starting messages were printed or not.
+     *
+     * @var bool
+     */
+    protected $starting_messages_printed = false;
+
 
     public function __construct($opts = array())
     {
@@ -69,7 +84,12 @@ public function run()
         $this->verifyConfiguration();
         $this->initCoverage();
         $this->load();
-        $this->printer->start($this->options);
+
+        // Print the starting messages only if they were not printed yet.
+        if (!$this->starting_messages_printed) {
+            $this->printer->start($this->options);
+            $this->starting_messages_printed = true;
+        }
     }
 
     /**
@@ -95,7 +115,17 @@ protected function load()
     {
         $loader = new SuiteLoader($this->options);
         $loader->load($this->options->path);
-        $executables = $this->options->functional ? $loader->getTestMethods() : $loader->getSuites();
+        $executables = $this->options->functional || $this->options->only_repeat_failed ? $loader->getTestMethods() : $loader->getSuites();
+        // Skip successful tests.
+        if ($this->options->only_repeat_failed) {
+            foreach ($this->succeeded as $test) {
+                foreach ($executables as $key => $executable) {
+                    if ($test->getPath() == $executable->getPath() && $test->getName() == $executable->getName()) {
+                        unset($executables[$key]);
+                    }
+                }
+            }
+        }
         $this->pending = array_merge($this->pending, $executables);
         foreach ($this->pending as $pending) {
             $this->printer->addTest($pending);

src/ParaTest/Runners/PHPUnit/Options.php

@@ -57,6 +57,20 @@ class Options
      */
     protected $filtered;
 
+    /**
+     * The number of times that a test needs to be repeated.
+     *
+     * @var int
+     */
+    protected $repeat;
+
+    /**
+     * Whether or not should repeat only the failing tests.
+     *
+     * @var int
+     */
+    protected $only_repeat_failed;
+
     /**
      * A collection of option values directly corresponding
      * to certain annotations - i.e group
@@ -82,6 +96,8 @@ public function __construct($opts = array())
         $this->testsuite = $opts['testsuite'];
         $this->maxBatchSize = $opts['max-batch-size'];
         $this->filter = $opts['filter'];
+        $this->repeat = $opts['repeat'];
+        $this->only_repeat_failed = $opts['only-repeat-failed'];
 
         // we need to register that options if they are blank but do not get them as
         // key with null value in $this->filtered as it will create problems for
@@ -133,7 +149,9 @@ protected static function defaults()
             'colors' => false,
             'testsuite' => '',
             'max-batch-size' => 0,
-            'filter' => null
+            'filter' => null,
+            'repeat' => 1,
+            'only-repeat-failed' => 0,
         );
     }
 
@@ -196,7 +214,9 @@ protected function filterOptions($options)
             'colors' => $this->colors,
             'testsuite' => $this->testsuite,
             'max-batch-size' => $this->maxBatchSize,
-            'filter' => $this->filter
+            'filter' => $this->filter,
+            'repeat' => $this->repeat,
+            'only-repeat-failed' => $this->only_repeat_failed,
         ));
         if ($configuration = $this->getConfigurationPath($filtered)) {
             $filtered['configuration'] = new Configuration($configuration);

src/ParaTest/Runners/PHPUnit/ResultPrinter.php

@@ -318,7 +318,7 @@ protected function processReaderFeedback($reader, $expectedTestCount)
             $this->printFeedbackItem($item);
         }
 
-        if ($this->processSkipped) {
+        if (isset($this->processSkipped)) {
             $this->printSkippedAndIncomplete($actualTestCount, $expectedTestCount);
         }
     }

src/ParaTest/Runners/PHPUnit/Runner.php

@@ -28,8 +28,12 @@ public function run()
         parent::run();
 
         while (count($this->running) || count($this->pending)) {
+            /** @var ExecutableTest $test */
             foreach ($this->running as $key => $test) {
                 if (!$this->testIsStillRunning($test)) {
+                    if ($test->getExitCode() === 0) {
+                        $this->succeeded[] = $test;
+                    }
                     unset($this->running[$key]);
                     $this->releaseToken($key);
                 }
@@ -46,7 +50,7 @@ public function run()
      * logs any results to JUnit, and cleans up temporary
      * files
      */
-    private function complete()
+    public function complete()
     {
         $this->printer->printResults();
         $this->interpreter->rewind();

src/ParaTest/Runners/PHPUnit/WrapperRunner.php

@@ -148,7 +148,7 @@ private function streamsOf($workers)
         return $streams;
     }
 
-    private function complete()
+    public function complete()
     {
         $this->setExitCode();
         $this->printer->printResults();

test/fixtures/results/mixed-results-with-skipped.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites>
+    <testsuite name="test/fixtures/tests/" tests="4" assertions="2" failures="1" errors="1" skipped="1" time="0.007625">
+        <testsuite name="UnitTestWithClassAnnotationTest" tests="2" assertions="2" failures="1" errors="0"
+                   time="0.006109"
+                   file="/home/brian/Projects/parallel-phpunit/test/fixtures/tests/UnitTestWithClassAnnotationTest.php">
+            <testcase name="testTruth" class="UnitTestWithClassAnnotationTest"
+                      file="/home/brian/Projects/parallel-phpunit/test/fixtures/tests/UnitTestWithClassAnnotationTest.php"
+                      line="10" assertions="1" time="0.001760"/>
+            <testcase name="testFalsehood" class="UnitTestWithClassAnnotationTest"
+                      file="/home/brian/Projects/parallel-phpunit/test/fixtures/tests/UnitTestWithClassAnnotationTest.php"
+                      line="18" assertions="1" time="0.001195">
+                <failure type="PHPUnit_Framework_ExpectationFailedException">
+                    UnitTestWithClassAnnotationTest::testFalsehood
+                    Failed asserting that true is false.
+
+                    /home/brian/Projects/parallel-phpunit/test/fixtures/tests/UnitTestWithClassAnnotationTest.php:20
+                </failure>
+            </testcase>
+        </testsuite>
+        <testsuite name="UnitTestWithErrorTest"
+                   file="/home/brian/Projects/parallel-phpunit/test/fixtures/tests/UnitTestWithErrorTest.php" tests="1"
+                   assertions="0" failures="0" errors="1" time="0.000397">
+            <testcase name="testTruth" class="UnitTestWithErrorTest"
+                      file="/home/brian/Projects/parallel-phpunit/test/fixtures/tests/UnitTestWithErrorTest.php"
+                      line="10" assertions="0" time="0.000397">
+                <error type="Exception">UnitTestWithErrorTest::testTruth
+                    Exception: Error!!!
+
+                    /home/brian/Projects/parallel-phpunit/test/fixtures/tests/UnitTestWithErrorTest.php:12
+                </error>
+            </testcase>
+        </testsuite>
+    </testsuite>
+</testsuites>

test/functional/EmptyRunnerStub.php

@@ -10,6 +10,10 @@
  */
 class EmptyRunnerStub extends \ParaTest\Runners\PHPUnit\BaseRunner
 {
+    public function complete()
+    {
+    }
+
     public function run()
     {
         echo "EXECUTED";

test/unit/ParaTest/Console/Commands/ParaTestCommandTest.php

@@ -50,6 +50,8 @@ public function testConfiguredDefinitionWithPHPUnitTester()
             new InputOption('testsuite', null, InputOption::VALUE_OPTIONAL, 'Filter which testsuite to run'),
             new InputOption('max-batch-size', 'm', InputOption::VALUE_REQUIRED, 'Max batch size (only for functional mode).', 0),
             new InputOption('filter', null, InputOption::VALUE_REQUIRED, 'Filter (only for functional mode).'),
+            new InputOption('repeat', null, InputOption::VALUE_REQUIRED, 'Runs the test(s) repeatedly.', 1),
+            new InputOption('only-repeat-failed', null, InputOption::VALUE_NONE, 'Repeat only failing tests.', null),
         );
         if (ParaTestCommand::isWhitelistSupported()) {
             $options[] = new InputOption('whitelist', null, InputOption::VALUE_REQUIRED, 'Directory to add to the coverage whitelist.');

test/unit/ParaTest/ResultTester.php

@@ -9,6 +9,7 @@ abstract class ResultTester extends \TestBase
     protected $failureSuite;
     protected $otherErrorSuite;
     protected $mixedSuite;
+    protected $skippedSuite;
     protected $passingSuite;
     protected $dataProviderSuite;
 
@@ -18,6 +19,7 @@ public function setUp()
         $this->otherErrorSuite = $this->getSuiteWithResult('single-werror2.xml', 1);
         $this->failureSuite = $this->getSuiteWithResult('single-wfailure.xml', 3);
         $this->mixedSuite = $this->getSuiteWithResult('mixed-results.xml', 7);
+        $this->skippedSuite = $this->getSuiteWithResult('mixed-results-with-skipped.xml', 4);
         $this->passingSuite = $this->getSuiteWithResult('single-passing.xml', 3);
         $this->dataProviderSuite = $this->getSuiteWithResult('data-provider-result.xml', 50);
     }

test/unit/ParaTest/Runners/PHPUnit/OptionsTest.php

@@ -13,7 +13,9 @@ public function setUp()
             'phpunit' => 'phpunit',
             'functional' => true,
             'group' => 'group1',
-            'bootstrap' => '/path/to/bootstrap'
+            'bootstrap' => '/path/to/bootstrap',
+            'repeat' => 2,
+            'only-repeat-failed' => true
         ); 
         $this->options = new Options($this->unfiltered);
         $this->cleanUpConfigurations();
@@ -44,6 +46,9 @@ public function testDefaults()
         $this->assertEmpty($options->path);
         $this->assertEquals(PHPUNIT, $options->phpunit);
         $this->assertFalse($options->functional);
+        $this->assertEquals(1, $options->repeat);
+        $this->assertEquals(0, $options->only_repeat_failed);
+
     }
 
     public function testConfigurationShouldReturnXmlIfConfigNotSpecifiedAndFileExistsInCwd()

test/unit/ParaTest/Runners/PHPUnit/ResultPrinterTest.php

@@ -227,6 +227,15 @@ public function testPrintFeedbackForMixed()
         $this->assertEquals('.F.E.F.', $contents);
     }
 
+    public function testPrintFeedbackForSkipped()
+    {
+        $this->printer->addTest($this->skippedSuite);
+        ob_start();
+        $this->printer->printFeedback($this->skippedSuite);
+        $contents = ob_get_clean();
+        $this->assertEquals('.FES', $contents);
+    }
+
     public function testPrintFeedbackForMoreThan100Suites()
     {
         //add tests