Clean up all left-over references to stop default loop

Author: clue

tests/Query/TcpTransportExecutorTest.php

@@ -420,6 +420,9 @@ public function testQueryRejectsWhenServerClosesConnection()
         Loop::addReadStream($server, function ($server) {
             $client = stream_socket_accept($server);
             fclose($client);
+
+            Loop::removeReadStream($server);
+            fclose($server);
         });
 
         $address = stream_socket_get_name($server, false);
@@ -447,16 +450,17 @@ function ($e) use (&$exception) {
 
     public function testQueryKeepsPendingIfServerSendsIncompleteMessageLength()
     {
+        $client = null;
         $server = stream_socket_server('tcp://127.0.0.1:0');
-        Loop::addReadStream($server, function ($server) {
+        Loop::addReadStream($server, function ($server) use (&$client) {
             $client = stream_socket_accept($server);
             Loop::addReadStream($client, function ($client) {
                 Loop::removeReadStream($client);
                 fwrite($client, "\x00");
             });
 
-            // keep reference to client to avoid disconnecting
-            Loop::addTimer(1, function () use ($client) { });
+            Loop::removeReadStream($server);
+            fclose($server);
         });
 
         $address = stream_socket_get_name($server, false);
@@ -475,20 +479,25 @@ function ($e) use (&$wait) {
 
         \Clue\React\Block\sleep(0.2);
         $this->assertTrue($wait);
+
+        $this->assertNotNull($client);
+        fclose($client);
+        Loop::removeReadStream($client);
     }
 
     public function testQueryKeepsPendingIfServerSendsIncompleteMessageBody()
     {
+        $client = null;
         $server = stream_socket_server('tcp://127.0.0.1:0');
-        Loop::addReadStream($server, function ($server) {
+        Loop::addReadStream($server, function ($server) use (&$client) {
             $client = stream_socket_accept($server);
             Loop::addReadStream($client, function ($client) {
                 Loop::removeReadStream($client);
                 fwrite($client, "\x00\xff" . "some incomplete message data");
             });
 
-            // keep reference to client to avoid disconnecting
-            Loop::addTimer(1, function () use ($client) { });
+            Loop::removeReadStream($server);
+            fclose($server);
         });
 
         $address = stream_socket_get_name($server, false);
@@ -507,6 +516,10 @@ function ($e) use (&$wait) {
 
         \Clue\React\Block\sleep(0.2);
         $this->assertTrue($wait);
+
+        $this->assertNotNull($client);
+        fclose($client);
+        Loop::removeReadStream($client);
     }
 
     public function testQueryRejectsWhenServerSendsInvalidMessage()
@@ -518,6 +531,9 @@ public function testQueryRejectsWhenServerSendsInvalidMessage()
                 Loop::removeReadStream($client);
                 fwrite($client, "\x00\x0f" . 'invalid message');
             });
+
+            Loop::removeReadStream($server);
+            fclose($server);
         });
 
         $address = stream_socket_get_name($server, false);
@@ -567,6 +583,9 @@ public function testQueryRejectsWhenServerSendsInvalidId()
 
                 fwrite($client, $data);
             });
+
+            Loop::removeReadStream($server);
+            fclose($server);
         });
 
         $address = stream_socket_get_name($server, false);
@@ -616,6 +635,9 @@ public function testQueryRejectsIfServerSendsTruncatedResponse()
 
                 fwrite($client, $data);
             });
+
+            Loop::removeReadStream($server);
+            fclose($server);
         });
 
         $address = stream_socket_get_name($server, false);
@@ -655,6 +677,9 @@ public function testQueryResolvesIfServerSendsValidResponse()
 
                 fwrite($client, $data);
             });
+
+            Loop::removeReadStream($server);
+            fclose($server);
         });
 
         $address = stream_socket_get_name($server, false);

tests/Query/UdpTransportExecutorTest.php

@@ -254,6 +254,9 @@ public function testQueryKeepsPendingIfServerSendsInvalidMessage()
         Loop::addReadStream($server, function ($server) {
             $data = stream_socket_recvfrom($server, 512, 0, $peer);
             stream_socket_sendto($server, 'invalid', 0, $peer);
+
+            Loop::removeReadStream($server);
+            fclose($server);
         });
 
         $address = stream_socket_get_name($server, false);
@@ -272,6 +275,8 @@ function ($e) use (&$wait) {
 
         \Clue\React\Block\sleep(0.2);
         $this->assertTrue($wait);
+
+        $promise->cancel();
     }
 
     public function testQueryKeepsPendingIfServerSendsInvalidId()
@@ -287,6 +292,9 @@ public function testQueryKeepsPendingIfServerSendsInvalidId()
             $message->id = 0;
 
             stream_socket_sendto($server, $dumper->toBinary($message), 0, $peer);
+
+            Loop::removeReadStream($server);
+            fclose($server);
         });
 
         $address = stream_socket_get_name($server, false);
@@ -305,6 +313,8 @@ function ($e) use (&$wait) {
 
         \Clue\React\Block\sleep(0.2);
         $this->assertTrue($wait);
+
+        $promise->cancel();
     }
 
     public function testQueryRejectsIfServerSendsTruncatedResponse()
@@ -320,6 +330,9 @@ public function testQueryRejectsIfServerSendsTruncatedResponse()
             $message->tc = true;
 
             stream_socket_sendto($server, $dumper->toBinary($message), 0, $peer);
+
+            Loop::removeReadStream($server);
+            fclose($server);
         });
 
         $address = stream_socket_get_name($server, false);
@@ -349,6 +362,9 @@ public function testQueryResolvesIfServerSendsValidResponse()
             $message = $parser->parseMessage($data);
 
             stream_socket_sendto($server, $dumper->toBinary($message), 0, $peer);
+
+            Loop::removeReadStream($server);
+            fclose($server);
         });
 
         $address = stream_socket_get_name($server, false);