Merge pull request #132 from clue-labs/internet

Add test group to skip integration tests relying on internet connection and apply timeouts

Author: WyriHaximus

README.md

@@ -1203,6 +1203,14 @@ To run the test suite, go to the project root and run:
 $ php vendor/bin/phpunit
 ```
 
+The test suite also contains a number of functional integration tests that rely
+on a stable internet connection.
+If you do not want to run these, they can simply be skipped like this:
+
+```bash
+$ php vendor/bin/phpunit --exclude-group internet
+```
+
 ## License
 
 MIT, see [LICENSE file](LICENSE).

tests/FunctionalInternetTest.php

@@ -2,8 +2,9 @@
 
 namespace React\Tests\Stream;
 
-use React\Stream\DuplexResourceStream;
 use React\EventLoop\Factory;
+use React\EventLoop\LoopInterface;
+use React\Stream\DuplexResourceStream;
 use React\Stream\WritableResourceStream;
 
 /**
@@ -28,14 +29,14 @@ public function testUploadKilobytePlain()
 
         $stream->write("POST /post HTTP/1.0\r\nHost: httpbin.org\r\nContent-Length: $size\r\n\r\n" . str_repeat('.', $size));
 
-        $loop->run();
+        $this->awaitStreamClose($stream, $loop);
 
         $this->assertNotEquals('', $buffer);
     }
 
     public function testUploadBiggerBlockPlain()
     {
-        $size = 1000 * 30;
+        $size = 50 * 1000;
         $stream = stream_socket_client('tcp://httpbin.org:80');
 
         $loop = Factory::create();
@@ -50,7 +51,7 @@ public function testUploadBiggerBlockPlain()
 
         $stream->write("POST /post HTTP/1.0\r\nHost: httpbin.org\r\nContent-Length: $size\r\n\r\n" . str_repeat('.', $size));
 
-        $loop->run();
+        $this->awaitStreamClose($stream, $loop);
 
         $this->assertNotEquals('', $buffer);
     }
@@ -72,14 +73,14 @@ public function testUploadKilobyteSecure()
 
         $stream->write("POST /post HTTP/1.0\r\nHost: httpbin.org\r\nContent-Length: $size\r\n\r\n" . str_repeat('.', $size));
 
-        $loop->run();
+        $this->awaitStreamClose($stream, $loop);
 
         $this->assertNotEquals('', $buffer);
     }
 
     public function testUploadBiggerBlockSecureRequiresSmallerChunkSize()
     {
-        $size = 1000 * 30000;
+        $size = 50 * 1000;
         $stream = stream_socket_client('tls://httpbin.org:443');
 
         $loop = Factory::create();
@@ -99,8 +100,23 @@ public function testUploadBiggerBlockSecureRequiresSmallerChunkSize()
 
         $stream->write("POST /post HTTP/1.0\r\nHost: httpbin.org\r\nContent-Length: $size\r\n\r\n" . str_repeat('.', $size));
 
-        $loop->run();
+        $this->awaitStreamClose($stream, $loop);
 
         $this->assertNotEquals('', $buffer);
     }
+
+    private function awaitStreamClose(DuplexResourceStream $stream, LoopInterface $loop, $timeout = 10.0)
+    {
+        $stream->on('close', function () use ($loop) {
+            $loop->stop();
+        });
+
+        $that = $this;
+        $loop->addTimer($timeout, function () use ($loop, $that) {
+            $loop->stop();
+            $that->fail('Timed out while waiting for stream to close');
+        });
+
+        $loop->run();
+    }
 }