Merge lp:~cjwatson/ampoule/process-error-not-ready into lp:ampoule

[Colin Watson]

Don't add a process back to the ready set if it received an error such as a timeout.

This stops calls from being dispatched to a worker that just timed out and is about to be killed.

[Colin Watson (cjwatson)]

This was fixed slightly differently in the new upstream location: https://github.com/twisted/ampoule/pull/30

Unmerged revisions

47. By Colin Watson on 2017-09-15

Don't add a process back to the ready set if it received an error such as a timeout.

=== modified file 'ampoule/pool.py'
--- ampoule/pool.py	2012-04-13 03:27:08 +0000
+++ ampoule/pool.py	2017-09-15 17:16:28 +0000
@@ -223,7 +223,7 @@
             cancelCall(timeoutCall)
             cancelCall(deadlineCall)
             self.busy.discard(child)
-            if not die:
+            if not die and not is_error:
                 # we are not marked to be removed, so add us back to
                 # the ready set and let's see if there's some catching
                 # up to do
 
=== modified file 'ampoule/test/test_process.py'
--- ampoule/test/test_process.py	2012-04-13 03:27:08 +0000
+++ ampoule/test/test_process.py	2017-09-15 17:16:28 +0000
@@ -781,15 +781,25 @@
             ).addCallback(lambda _: pp.stop())
 
     def processTimeoutTest(self, timeout):
+        """
+        A call with a timeout is correctly terminated, and the process pool
+        starts a new worker so that it can handle further calls.
+        """
         pp = pool.ProcessPool(WaitingChild, min=1, max=1)
+        ECHO_STRING = "hello"
         
-        def _work(_):
+        def _first(_):
             d = pp.callRemote(First, data="ciao", _timeout=timeout)
             self.assertFailure(d, error.ProcessTerminated)
             return d
 
+        def _echo(_):
+            return pp.callRemote(commands.Echo, data=ECHO_STRING
+                ).addCallback(self.assertEqual, {"response": ECHO_STRING})
+
         return pp.start(
-            ).addCallback(_work
+            ).addCallback(_first
+            ).addCallback(_echo
             ).addCallback(lambda _: pp.stop())
 
     def test_processTimeout(self):