Fix DefaultPool::shutdown()

Forgot to update this to match Worker::shutdown() behavior.
amphp · Oct 27, 2018 · 4c3c93e · 4c3c93e
1 parent eff56fb
commit 4c3c93e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/lib/Worker/DefaultPool.php b/lib/Worker/DefaultPool.php
@@ -35,6 +35,9 @@ final class DefaultPool implements Pool
     /** @var \Closure */
     private $push;
 
+    /** @var \Amp\Promise|null */
+    private $exitStatus;
+
     /**
      * Creates a new worker pool.
      *
@@ -162,8 +165,8 @@ public function enqueue(Task $task): Promise
      */
     public function shutdown(): Promise
     {
-        if (!$this->isRunning()) {
-            throw new StatusError("The pool was shutdown");
+        if ($this->exitStatus) {
+            return $this->exitStatus;
         }
 
         $this->running = false;
@@ -175,7 +178,7 @@ public function shutdown(): Promise
             }
         }
 
-        return Promise\all($shutdowns);
+        return $this->exitStatus = Promise\all($shutdowns);
     }
 
     /**

diff --git a/test/Worker/AbstractPoolTest.php b/test/Worker/AbstractPoolTest.php
@@ -42,19 +42,15 @@ public function testIsIdleOnStart()
         });
     }
 
-    /**
-     * @expectedException         \Amp\Parallel\Context\StatusError
-     * @expectedExceptionMessage  The pool was shutdown
-     */
-    public function testShutdownShouldThrowStatusError()
+    public function testShutdownShouldReturnSameResult()
     {
         Loop::run(function () {
             $pool = $this->createPool();
 
             $this->assertTrue($pool->isIdle());
 
-            yield $pool->shutdown();
-            yield $pool->shutdown();
+            $result = yield $pool->shutdown();
+            $this->assertSame($result, yield $pool->shutdown());
         });
     }