Merge branch 'stop-on-failure' of https://github.com/mpartel/paratest …

…into mpartel-stop-on-failure Conflicts: README.md functional/PHPUnitTest.php it/ParaTest/Runners/PHPUnit/RunnerIntegrationTest.php src/ParaTest/Console/Testers/PHPUnit.php src/ParaTest/Runners/PHPUnit/Options.php test/ParaTest/Console/Commands/ParaTestCommandTest.php test/ParaTest/Console/Testers/PHPUnitTest.php test/ParaTest/Runners/PHPUnit/SuiteLoaderTest.php test/fixtures/output/usage.txt
paratestphp · Apr 12, 2014 · da81030 · da81030
1 parent f799c4d
commit da81030
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/functional/PHPUnitTest.php b/functional/PHPUnitTest.php
@@ -329,7 +329,7 @@ public function testFunctionalModeEachTestCalledOnce()
     protected function assertResults($results)
     {
         $this->assertRegExp("/FAILURES!
-Tests: 37, Assertions: 42, Failures: 6, Errors: 1./", $results);
+Tests: 39, Assertions: 42, Failures: 6, Errors: 1./", $results);
     }
 
     protected function assertOkResults($results, $tests, $assertions)

diff --git a/test/ParaTest/Runners/PHPUnit/SuiteLoaderTest.php b/test/ParaTest/Runners/PHPUnit/SuiteLoaderTest.php
@@ -88,7 +88,7 @@ public function testLoadSuiteFromConfigWithMultipleDirs()
         $loader = new SuiteLoader($options);
         $loader->load();
         $files = $this->getObjectValue($loader, 'files');
-        $this->assertEquals(16, sizeof($files));
+        $this->assertEquals(17, sizeof($files));
     }