Merge pull request #55 from clue-labs/phpunit

Fix test suite race condition by catching namespaced Exception variant
reactphp · Dec 21, 2017 · 45cbd17 · 45cbd17
2 parents 266770c + 7e76177
commit 45cbd17
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/tests/AbstractProcessTest.php b/tests/AbstractProcessTest.php
@@ -4,6 +4,7 @@
 
 use React\ChildProcess\Process;
 use React\EventLoop\Timer\Timer;
+use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
 use SebastianBergmann\Environment\Runtime;
 
@@ -468,7 +469,11 @@ public function assertSoon(\Closure $callback, $timeout = 20000, $interval = 200
             try {
                 call_user_func($callback);
                 return;
-            } catch (\PHPUnit_Framework_ExpectationFailedException $e) {}
+            } catch (ExpectationFailedException $e) {
+                // namespaced PHPUnit exception
+            } catch (\PHPUnit_Framework_ExpectationFailedException $e) {
+                // legacy PHPUnit exception
+            }
 
             if ((microtime(true) - $start) > $timeout) {
                 throw $e;