Merge pull request #283 from SimonFrings/eventloop

Use default loop in testsuite and close server and connection leftovers
reactphp · Jan 13, 2022 · 7b6772a · 7b6772a
2 parents 85a920a + 4f2497b
commit 7b6772a
Show file tree

Hide file tree

Showing 16 changed files with 600 additions and 596 deletions.
diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
         "react/stream": "^1.2"
     },
     "require-dev": {
-        "clue/block-react": "^1.2",
+        "clue/block-react": "^1.5",
         "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
         "react/promise-stream": "^1.2"
     },

diff --git a/tests/FdServerTest.php b/tests/FdServerTest.php
@@ -3,8 +3,8 @@
 namespace React\Tests\Socket;
 
 use Clue\React\Block;
-use React\EventLoop\Loop;
 use React\Promise\Promise;
+use React\Socket\ConnectionInterface;
 use React\Socket\FdServer;
 
 class FdServerTest extends TestCase
@@ -302,16 +302,21 @@ public function testServerEmitsConnectionEventForNewConnection()
 
         $client = stream_socket_client('tcp://' . stream_socket_get_name($socket, false));
 
-        $server = new FdServer($fd, Loop::get());
+        $server = new FdServer($fd);
         $promise = new Promise(function ($resolve) use ($server) {
             $server->on('connection', $resolve);
         });
 
-        $connection = Block\await($promise, Loop::get(), 1.0);
+        $connection = Block\await($promise, null, 1.0);
 
+        /**
+         * @var ConnectionInterface $connection
+         */
         $this->assertInstanceOf('React\Socket\ConnectionInterface', $connection);
 
         fclose($client);
+        $connection->close();
+        $server->close();
     }
 
     public function testEmitsErrorWhenAcceptListenerFails()

diff --git a/tests/FunctionalConnectorTest.php b/tests/FunctionalConnectorTest.php
@@ -3,7 +3,7 @@
 namespace React\Tests\Socket;
 
 use Clue\React\Block;
-use React\EventLoop\Factory;
+use React\EventLoop\Loop;
 use React\Promise\Deferred;
 use React\Socket\ConnectionInterface;
 use React\Socket\Connector;
@@ -20,13 +20,11 @@ class FunctionalConnectorTest extends TestCase
     /** @test */
     public function connectionToTcpServerShouldSucceedWithLocalhost()
     {
-        $loop = Factory::create();
+        $server = new TcpServer(9998);
 
-        $server = new TcpServer(9998, $loop);
+        $connector = new Connector(array());
 
-        $connector = new Connector(array(), $loop);
-
-        $connection = Block\await($connector->connect('localhost:9998'), $loop, self::TIMEOUT);
+        $connection = Block\await($connector->connect('localhost:9998'), null, self::TIMEOUT);
 
         $server->close();
 
@@ -44,18 +42,16 @@ public function testConnectTwiceWithoutHappyEyeBallsOnlySendsSingleDnsQueryDueTo
             $this->markTestSkipped('Not supported on Windows for PHP versions < 7.0 and legacy HHVM');
         }
 
-        $loop = Factory::create();
-
         $socket = stream_socket_server('udp://127.0.0.1:0', $errno, $errstr, STREAM_SERVER_BIND);
 
         $connector = new Connector(array(
             'dns' => 'udp://' . stream_socket_get_name($socket, false),
             'happy_eyeballs' => false
-        ), $loop);
+        ));
 
         // minimal DNS proxy stub which forwards DNS messages to actual DNS server
         $received = 0;
-        $loop->addReadStream($socket, function ($socket) use (&$received) {
+        Loop::addReadStream($socket, function ($socket) use (&$received) {
             $request = stream_socket_recvfrom($socket, 65536, 0, $peer);
 
             $client = stream_socket_client('udp://8.8.8.8:53');
@@ -64,15 +60,18 @@ public function testConnectTwiceWithoutHappyEyeBallsOnlySendsSingleDnsQueryDueTo
 
             stream_socket_sendto($socket, $response, 0, $peer);
             ++$received;
+            fclose($client);
         });
 
-        $connection = Block\await($connector->connect('example.com:80'), $loop);
+        $connection = Block\await($connector->connect('example.com:80'));
         $connection->close();
         $this->assertEquals(1, $received);
 
-        $connection = Block\await($connector->connect('example.com:80'), $loop);
+        $connection = Block\await($connector->connect('example.com:80'));
         $connection->close();
         $this->assertEquals(1, $received);
+
+        Loop::removeReadStream($socket);
     }
 
     /**
@@ -84,11 +83,9 @@ public function connectionToRemoteTCP4n6ServerShouldResultInOurIP()
         // max_nesting_level was set to 100 for PHP Versions < 5.4 which resulted in failing test for legacy PHP
         ini_set('xdebug.max_nesting_level', 256);
 
-        $loop = Factory::create();
-
-        $connector = new Connector(array('happy_eyeballs' => true), $loop);
+        $connector = new Connector(array('happy_eyeballs' => true));
 
-        $ip = Block\await($this->request('dual.tlund.se', $connector), $loop, self::TIMEOUT);
+        $ip = Block\await($this->request('dual.tlund.se', $connector), null, self::TIMEOUT);
 
         $this->assertNotFalse(inet_pton($ip));
     }
@@ -99,12 +96,10 @@ public function connectionToRemoteTCP4n6ServerShouldResultInOurIP()
      */
     public function connectionToRemoteTCP4ServerShouldResultInOurIP()
     {
-        $loop = Factory::create();
-
-        $connector = new Connector(array('happy_eyeballs' => true), $loop);
+        $connector = new Connector(array('happy_eyeballs' => true));
 
         try {
-            $ip = Block\await($this->request('ipv4.tlund.se', $connector), $loop, self::TIMEOUT);
+            $ip = Block\await($this->request('ipv4.tlund.se', $connector), null, self::TIMEOUT);
         } catch (\Exception $e) {
             $this->checkIpv4();
             throw $e;
@@ -120,12 +115,10 @@ public function connectionToRemoteTCP4ServerShouldResultInOurIP()
      */
     public function connectionToRemoteTCP6ServerShouldResultInOurIP()
     {
-        $loop = Factory::create();
-
-        $connector = new Connector(array('happy_eyeballs' => true), $loop);
+        $connector = new Connector(array('happy_eyeballs' => true));
 
         try {
-            $ip = Block\await($this->request('ipv6.tlund.se', $connector), $loop, self::TIMEOUT);
+            $ip = Block\await($this->request('ipv6.tlund.se', $connector), null, self::TIMEOUT);
         } catch (\Exception $e) {
             $this->checkIpv6();
             throw $e;
@@ -141,30 +134,28 @@ public function testCancelPendingTlsConnectionDuringTlsHandshakeShouldCloseTcpCo
             $this->markTestSkipped('Not supported on legacy HHVM');
         }
 
-        $loop = Factory::create();
-
-        $server = new TcpServer(0, $loop);
+        $server = new TcpServer(0);
         $uri = str_replace('tcp://', 'tls://', $server->getAddress());
 
-        $connector = new Connector(array(), $loop);
+        $connector = new Connector(array());
         $promise = $connector->connect($uri);
 
         $deferred = new Deferred();
-        $server->on('connection', function (ConnectionInterface $connection) use ($promise, $deferred, $loop) {
+        $server->on('connection', function (ConnectionInterface $connection) use ($promise, $deferred) {
             $connection->on('close', function () use ($deferred) {
                 $deferred->resolve();
             });
 
-            $loop->futureTick(function () use ($promise) {
+            Loop::futureTick(function () use ($promise) {
                 $promise->cancel();
             });
         });
 
-        Block\await($deferred->promise(), $loop, self::TIMEOUT);
+        Block\await($deferred->promise(), null, self::TIMEOUT);
         $server->close();
 
         try {
-            Block\await($promise, $loop, self::TIMEOUT);
+            Block\await($promise, null, self::TIMEOUT);
             $this->fail();
         } catch (\Exception $e) {
             $this->assertInstanceOf('RuntimeException', $e);