Fix forward compatibility with upcoming EventLoop releases in tests

Author: clue

composer.json

@@ -13,7 +13,7 @@
         "react/promise-timer": "~1.0"
     },
     "require-dev": {
-        "clue/block-react": "^1.1",
+        "clue/block-react": "^1.2",
         "phpunit/phpunit": "^5.0 || ^4.8"
     },
     "autoload": {

tests/TcpServerTest.php

@@ -2,6 +2,7 @@
 
 namespace React\Tests\Socket;
 
+use Clue\React\Block;
 use React\EventLoop\StreamSelectLoop;
 use React\Socket\TcpServer;
 use React\Stream\DuplexResourceStream;
@@ -37,7 +38,8 @@ public function testConnection()
         $client = stream_socket_client('tcp://localhost:'.$this->port);
 
         $this->server->on('connection', $this->expectCallableOnce());
-        $this->loop->tick();
+
+        $this->tick();
     }
 
     /**
@@ -50,9 +52,9 @@ public function testConnectionWithManyClients()
         $client3 = stream_socket_client('tcp://localhost:'.$this->port);
 
         $this->server->on('connection', $this->expectCallableExactly(3));
-        $this->loop->tick();
-        $this->loop->tick();
-        $this->loop->tick();
+        $this->tick();
+        $this->tick();
+        $this->tick();
     }
 
     public function testDataEventWillNotBeEmittedWhenClientSendsNoData()
@@ -79,8 +81,8 @@ public function testDataWillBeEmittedWithDataClientSends()
         $this->server->on('connection', function ($conn) use ($mock) {
             $conn->on('data', $mock);
         });
-        $this->loop->tick();
-        $this->loop->tick();
+        $this->tick();
+        $this->tick();
     }
 
     public function testDataWillBeEmittedEvenWhenClientShutsDownAfterSending()
@@ -94,8 +96,8 @@ public function testDataWillBeEmittedEvenWhenClientShutsDownAfterSending()
         $this->server->on('connection', function ($conn) use ($mock) {
             $conn->on('data', $mock);
         });
-        $this->loop->tick();
-        $this->loop->tick();
+        $this->tick();
+        $this->tick();
     }
 
     public function testLoopWillEndWhenServerIsClosed()
@@ -169,9 +171,6 @@ public function testDataWillBeEmittedInMultipleChunksWhenClientSendsExcessiveAmo
         $this->assertEquals($bytes, $received);
     }
 
-    /**
-     * @covers React\EventLoop\StreamSelectLoop::tick
-     */
     public function testConnectionDoesNotEndWhenClientDoesNotClose()
     {
         $client = stream_socket_client('tcp://localhost:'.$this->port);
@@ -181,12 +180,11 @@ public function testConnectionDoesNotEndWhenClientDoesNotClose()
         $this->server->on('connection', function ($conn) use ($mock) {
             $conn->on('end', $mock);
         });
-        $this->loop->tick();
-        $this->loop->tick();
+        $this->tick();
+        $this->tick();
     }
 
     /**
-     * @covers React\EventLoop\StreamSelectLoop::tick
      * @covers React\Socket\Connection::end
      */
     public function testConnectionDoesEndWhenClientCloses()
@@ -200,8 +198,8 @@ public function testConnectionDoesEndWhenClientCloses()
         $this->server->on('connection', function ($conn) use ($mock) {
             $conn->on('end', $mock);
         });
-        $this->loop->tick();
-        $this->loop->tick();
+        $this->tick();
+        $this->tick();
     }
 
     public function testCtorAddsResourceToLoop()
@@ -270,4 +268,9 @@ public function tearDown()
             $this->server->close();
         }
     }
+
+    private function tick()
+    {
+        Block\sleep(0, $this->loop);
+    }
 }