Merge pull request #290 from clue-labs/fragile

Improve test suite to be less fragile

Author: WyriHaximus

tests/FunctionalServerTest.php

@@ -472,13 +472,38 @@ public function testClosedStreamFromRequestHandlerWillSendEmptyBody()
         $socket->close();
     }
 
+    public function testRequestHandlerWillReceiveCloseEventIfConnectionClosesWhileSendingBody()
+    {
+        $loop = Factory::create();
+        $connector = new Connector($loop);
+
+        $once = $this->expectCallableOnce();
+        $server = new StreamingServer(function (RequestInterface $request) use ($once) {
+            $request->getBody()->on('close', $once);
+        });
+
+        $socket = new Socket(0, $loop);
+        $server->listen($socket);
+
+        $connector->connect($socket->getAddress())->then(function (ConnectionInterface $conn) use ($loop) {
+            $conn->write("GET / HTTP/1.0\r\nContent-Length: 100\r\n\r\n");
+
+            $loop->addTimer(0.001, function() use ($conn) {
+                $conn->end();
+            });
+        });
+
+        Block\sleep(0.1, $loop);
+
+        $socket->close();
+    }
+
     public function testStreamFromRequestHandlerWillBeClosedIfConnectionClosesWhileSendingBody()
     {
         $loop = Factory::create();
         $connector = new Connector($loop);
 
         $stream = new ThroughStream();
-        $stream->on('close', $this->expectCallableOnce());
 
         $server = new StreamingServer(function (RequestInterface $request) use ($stream) {
             return new Response(200, array(), $stream);
@@ -487,22 +512,20 @@ public function testStreamFromRequestHandlerWillBeClosedIfConnectionClosesWhileS
         $socket = new Socket(0, $loop);
         $server->listen($socket);
 
-        $result = $connector->connect($socket->getAddress())->then(function (ConnectionInterface $conn) use ($loop) {
+        $connector->connect($socket->getAddress())->then(function (ConnectionInterface $conn) use ($loop) {
             $conn->write("GET / HTTP/1.0\r\nContent-Length: 100\r\n\r\n");
 
-            $loop->addTimer(0.1, function() use ($conn) {
+            $loop->addTimer(0.001, function() use ($conn) {
                 $conn->end();
             });
-
-            return Stream\buffer($conn);
         });
 
-        $response = Block\await($result, $loop, 1.0);
-
-        $this->assertStringStartsWith("HTTP/1.0 200 OK", $response);
-        $this->assertStringEndsWith("\r\n\r\n", $response);
+        // stream will be closed within 0.1s
+        $ret = Block\await(Stream\first($stream, 'close'), $loop, 0.1);
 
         $socket->close();
+
+        $this->assertNull($ret);
     }
 
     public function testStreamFromRequestHandlerWillBeClosedIfConnectionClosesButWillOnlyBeDetectedOnNextWrite()

tests/Io/MiddlewareRunnerTest.php

@@ -80,6 +80,14 @@ public function provideProcessStackMiddlewares()
      */
     public function testProcessStack(array $middlewares, $expectedCallCount)
     {
+        // the ProcessStack middleware instances are stateful, so reset these
+        // before running the test, to not fail with --repeat=100
+        foreach ($middlewares as $middleware) {
+            if ($middleware instanceof ProcessStack) {
+                $middleware->reset();
+            }
+        }
+
         $request = new ServerRequest('GET', 'https://example.com/');
         $middlewareStack = new MiddlewareRunner($middlewares);
 

tests/Middleware/ProcessStack.php

@@ -25,4 +25,9 @@ public function getCallCount()
     {
         return $this->callCount;
     }
+
+    public function reset()
+    {
+        $this->callCount = 0;
+    }
 }