Merge pull request #181 from clue-labs/tests

jsor · web-flow · commit 7016d6584d75 · 2019-02-04T15:53:10.000+01:00
Forward compatibility with PHPUnit 7 and fix false negative test results, use legacy PHPUnit 5 on legacy HHVM, skip signal tests when PCNTL is not available and skip timer tests on inacurrate platforms
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ php:
   - 7.1
   - 7.2
   - 7.3
-  - hhvm # ignore errors, see below
+# - hhvm # requires legacy phpunit & ignore errors, see below
 
 # lock distro so new future defaults will not break the build
 dist: trusty
@@ -18,6 +18,8 @@ matrix:
   include:
     - php: 5.3
       dist: precise
+    - php: hhvm
+      install: composer require phpunit/phpunit:^5 --dev --no-interaction
   allow_failures:
     - php: hhvm
 
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
         "php": ">=5.3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.8.35 || ^5.7 || ^6.4"
+        "phpunit/phpunit": "^7.0 || ^6.4 || ^5.7 || ^4.8.35"
     },
     "suggest": {
         "ext-event": "~1.0 for ExtEventLoop",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,8 +8,7 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
+         bootstrap="vendor/autoload.php"
 >
     <testsuites>
         <testsuite name="React Test Suite">
diff --git a/tests/AbstractLoopTest.php b/tests/AbstractLoopTest.php
@@ -491,10 +491,13 @@ function () {
 
     public function testRemoveSignalNotRegisteredIsNoOp()
     {
-        $this->loop->removeSignal(SIGINT, function () { });
+        $this->loop->removeSignal(2, function () { });
         $this->assertTrue(true);
     }
 
+    /**
+     * @requires extension pcntl
+     */
     public function testSignal()
     {
         if (!function_exists('posix_kill') || !function_exists('posix_getpid')) {
@@ -528,6 +531,9 @@ public function testSignal()
         $this->assertTrue($calledShouldNot);
     }
 
+    /**
+     * @requires extension pcntl
+     */
     public function testSignalMultipleUsagesForTheSameListener()
     {
         $funcCallCount = 0;
@@ -552,6 +558,9 @@ public function testSignalMultipleUsagesForTheSameListener()
         $this->assertSame(1, $funcCallCount);
     }
 
+    /**
+     * @requires extension pcntl
+     */
     public function testSignalsKeepTheLoopRunning()
     {
         $loop = $this->loop;
@@ -565,6 +574,9 @@ public function testSignalsKeepTheLoopRunning()
         $this->assertRunSlowerThan(1.5);
     }
 
+    /**
+     * @requires extension pcntl
+     */
     public function testSignalsKeepTheLoopRunningAndRemovingItStopsTheLoop()
     {
         $loop = $this->loop;
diff --git a/tests/SignalsHandlerTest.php b/tests/SignalsHandlerTest.php
@@ -6,6 +6,9 @@
 
 final class SignalsHandlerTest extends TestCase
 {
+    /**
+     * @requires extension pcntl
+     */
     public function testEmittedEventsAndCallHandling()
     {
         $callCount = 0;
diff --git a/tests/StreamSelectLoopTest.php b/tests/StreamSelectLoopTest.php
@@ -49,13 +49,10 @@ public function signalProvider()
     /**
      * Test signal interrupt when no stream is attached to the loop
      * @dataProvider signalProvider
+     * @requires extension pcntl
      */
     public function testSignalInterruptNoStream($signal)
     {
-        if (!extension_loaded('pcntl')) {
-            $this->markTestSkipped('"pcntl" extension is required to run this test.');
-        }
-
         // dispatch signal handler every 10ms for 0.1s
         $check = $this->loop->addPeriodicTimer(0.01, function() {
             pcntl_signal_dispatch();
@@ -80,13 +77,10 @@ public function testSignalInterruptNoStream($signal)
     /**
      * Test signal interrupt when a stream is attached to the loop
      * @dataProvider signalProvider
+     * @requires extension pcntl
      */
     public function testSignalInterruptWithStream($signal)
     {
-        if (!extension_loaded('pcntl')) {
-            $this->markTestSkipped('"pcntl" extension is required to run this test.');
-        }
-
         // dispatch signal handler every 10ms
         $this->loop->addPeriodicTimer(0.01, function() {
             pcntl_signal_dispatch();
diff --git a/tests/Timer/AbstractTimerTest.php b/tests/Timer/AbstractTimerTest.php
@@ -22,8 +22,28 @@ public function testAddTimerReturnsNonPeriodicTimerInstance()
         $this->assertFalse($timer->isPeriodic());
     }
 
+    /**
+     * @depends testPlatformHasHighAccuracy
+     */
     public function testAddTimerWillBeInvokedOnceAndBlocksLoopWhenRunning()
     {
+        // Make no strict assumptions about actual time interval. Common
+        // environments usually provide millisecond accuracy (or better), but
+        // Travis and other CI systems are slow.
+        // We try to compensate for this by skipping accurate tests when the
+        // current platform is known to be inaccurate. We test this by sleeping
+        // 3x1ms and then measure the time for each iteration before running the
+        // actual test.
+        for ($i = 0; $i < 3; ++$i) {
+            $start = microtime(true);
+            usleep(1000);
+            $time = microtime(true) - $start;
+
+            if ($time < 0.001 || $time > 0.002) {
+                $this->markTestSkipped('Platform provides insufficient accuracy (' . $time . ' s)');
+            }
+        }
+
         $loop = $this->createLoop();
 
         $loop->addTimer(0.001, $this->expectCallableOnce());
@@ -32,10 +52,8 @@ public function testAddTimerWillBeInvokedOnceAndBlocksLoopWhenRunning()
         $loop->run();
         $end = microtime(true);
 
-        // make no strict assumptions about actual time interval.
-        // must be at least 0.001s (1ms) and should not take longer than 0.1s
         $this->assertGreaterThanOrEqual(0.001, $end - $start);
-        $this->assertLessThan(0.1, $end - $start);
+        $this->assertLessThan(0.002, $end - $start);
     }
 
     public function testAddPeriodicTimerReturnsPeriodicTimerInstance()
diff --git a/tests/bootstrap.php b/tests/bootstrap.php

Original file line number	Diff line number	Diff line change
`@@ -491,10 +491,13 @@ function () {`
`491`	`491`
`492`	`492`	`public function testRemoveSignalNotRegisteredIsNoOp()`
`493`	`493`	`{`
`494`		`- $this->loop->removeSignal(SIGINT, function () { });`
	`494`	`+ $this->loop->removeSignal(2, function () { });`
`495`	`495`	`$this->assertTrue(true);`
`496`	`496`	`}`
`497`	`497`
	`498`	`+ /**`
	`499`	`+ * @requires extension pcntl`
	`500`	`+ */`
`498`	`501`	`public function testSignal()`
`499`	`502`	`{`
`500`	`503`	`if (!function_exists('posix_kill') \|\| !function_exists('posix_getpid')) {`
`@@ -528,6 +531,9 @@ public function testSignal()`
`528`	`531`	`$this->assertTrue($calledShouldNot);`
`529`	`532`	`}`
`530`	`533`
	`534`	`+ /**`
	`535`	`+ * @requires extension pcntl`
	`536`	`+ */`
`531`	`537`	`public function testSignalMultipleUsagesForTheSameListener()`
`532`	`538`	`{`
`533`	`539`	`$funcCallCount = 0;`
`@@ -552,6 +558,9 @@ public function testSignalMultipleUsagesForTheSameListener()`
`552`	`558`	`$this->assertSame(1, $funcCallCount);`
`553`	`559`	`}`
`554`	`560`
	`561`	`+ /**`
	`562`	`+ * @requires extension pcntl`
	`563`	`+ */`
`555`	`564`	`public function testSignalsKeepTheLoopRunning()`
`556`	`565`	`{`
`557`	`566`	`$loop = $this->loop;`
`@@ -565,6 +574,9 @@ public function testSignalsKeepTheLoopRunning()`
`565`	`574`	`$this->assertRunSlowerThan(1.5);`
`566`	`575`	`}`
`567`	`576`
	`577`	`+ /**`
	`578`	`+ * @requires extension pcntl`
	`579`	`+ */`
`568`	`580`	`public function testSignalsKeepTheLoopRunningAndRemovingItStopsTheLoop()`
`569`	`581`	`{`
`570`	`582`	`$loop = $this->loop;`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@`
`6`	`6`
`7`	`7`	`final class SignalsHandlerTest extends TestCase`
`8`	`8`	`{`
	`9`	`+ /**`
	`10`	`+ * @requires extension pcntl`
	`11`	`+ */`
`9`	`12`	`public function testEmittedEventsAndCallHandling()`
`10`	`13`	`{`
`11`	`14`	`$callCount = 0;`