fixed tests for HHVM, fixes #24

cebe · cebe · commit c0c889f88fec · 2016-03-04T01:20:46.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -7,11 +7,6 @@ php:
   - 7.0
   - hhvm
 
-matrix:
-  allow_failures:
-    - php: hhvm
-  fast_finish: true
-
 install: ./travis-init.sh
 
 script:
diff --git a/tests/AbstractLoopTest.php b/tests/AbstractLoopTest.php
@@ -176,7 +176,7 @@ public function runShouldReturnWhenNoMoreFds()
 
         $this->writeToStream($input, "foo\n");
 
-        $this->assertRunFasterThan(0.005);
+        $this->assertRunFasterThan(0.015);
     }
 
     /** @test */
@@ -194,7 +194,7 @@ public function stopShouldStopRunningLoop()
         $this->assertRunFasterThan(0.005);
     }
 
-    public function testStopShouldPreventRunFromBlocking()
+    public function testStopShouldPreventRunFromBlocking($timeLimit = 0.005)
     {
         $this->loop->addTimer(
             1,
@@ -209,7 +209,7 @@ function () {
             }
         );
 
-        $this->assertRunFasterThan(0.005);
+        $this->assertRunFasterThan($timeLimit);
     }
 
     public function testIgnoreRemovedCallback()
diff --git a/tests/StreamSelectLoopTest.php b/tests/StreamSelectLoopTest.php
@@ -37,6 +37,17 @@ public function testStreamSelectTimeoutEmulation()
         $this->assertGreaterThan(0.04, $interval);
     }
 
+    public function testStopShouldPreventRunFromBlocking($timeLimit = 0.005)
+    {
+        if (defined('HHVM_VERSION')) {
+            // HHVM is a bit slow, so give it more time
+            parent::testStopShouldPreventRunFromBlocking(0.5);
+        } else {
+            parent::testStopShouldPreventRunFromBlocking($timeLimit);
+        }
+    }
+
+
     public function signalProvider()
     {
         return [

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public function runShouldReturnWhenNoMoreFds()`
`176`	`176`
`177`	`177`	`$this->writeToStream($input, "foo\n");`
`178`	`178`
`179`		`- $this->assertRunFasterThan(0.005);`
	`179`	`+ $this->assertRunFasterThan(0.015);`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`/** @test */`
`@@ -194,7 +194,7 @@ public function stopShouldStopRunningLoop()`
`194`	`194`	`$this->assertRunFasterThan(0.005);`
`195`	`195`	`}`
`196`	`196`
`197`		`- public function testStopShouldPreventRunFromBlocking()`
	`197`	`+ public function testStopShouldPreventRunFromBlocking($timeLimit = 0.005)`
`198`	`198`	`{`
`199`	`199`	`$this->loop->addTimer(`
`200`	`200`	`1,`
`@@ -209,7 +209,7 @@ function () {`
`209`	`209`	`}`
`210`	`210`	`);`
`211`	`211`
`212`		`- $this->assertRunFasterThan(0.005);`
	`212`	`+ $this->assertRunFasterThan($timeLimit);`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`public function testIgnoreRemovedCallback()`