Improve worker shutdown

bzikarsky · Apr 28, 2021 · 4645211 · 4645211
1 parent b9eda1e
commit 4645211
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/Protocol/Connection.php b/src/Protocol/Connection.php
@@ -146,7 +146,7 @@ public function getCommandFactory(): CommandFactoryInterface
      */
     public function isClosed(): bool
     {
-        return $this->stream->isWritable();
+        return !$this->stream->isWritable();
     }
 
     /**

diff --git a/tests/Protocol/ConnectionTest.php b/tests/Protocol/ConnectionTest.php
@@ -13,6 +13,7 @@ class ConnectionTest extends \PHPUnit\Framework\TestCase
     protected $packetStr;
 
     protected $stream;
+    private $writableStream;
     protected Connection $connection;
 
     public function setUp(): void
@@ -27,9 +28,11 @@ protected function setUpStream()
         $fac = new CommandFactory();
         $fac->addType($this->type);
 
+        $this->writableStream = $this->createMock(\React\Stream\WritableStreamInterface::class);
+
         $this->stream = new \React\Stream\CompositeStream(
             $this->createMock(\React\Stream\ReadableStreamInterface::class),
-            $this->createMock(\React\Stream\WritableStreamInterface::class)
+            $this->writableStream
         );
 
         $this->connection = new Connection($this->stream, $fac);
@@ -53,6 +56,7 @@ public function testStreamClose()
             $closeCalled = true;
         });
 
+        $this->writableStream->method('isWritable')->willReturn(false);
         $this->stream->emit("close");
         self::assertTrue($closeCalled);
         self::assertTrue($this->connection->isClosed());
@@ -65,11 +69,11 @@ public function testStreamClose()
      */
     public function testSendFailOnClosedConnection(Connection $connection)
     {
+        $this->writableStream->method('isWritable')->willReturn(false);
+
         $this->expectException(BadMethodCallException::class);
         $thrown = null;
-        $connection->send($this->packet)->otherwise(function ($e) use (&$thrown) {
-            $thrown = $e;
-        });
+        $connection->send($this->packet);
     }
 
     public function testHandledPacketEvent()
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         public function isClosed(): bool
         {
-            return $this->stream->isWritable();
+            return !$this->stream->isWritable();
         }
         /**
@@ Expand Down @@