Merge lp:~cjwatson/rabbitfixture/fix-kill into lp:rabbitfixture

[Colin Watson]

Handle SIGCHLD in RabbitServerRunner.kill too.

[Ioana Lasc (ilasc)]

looks good

review: Approve

=== modified file 'rabbitfixture/server.py'
--- rabbitfixture/server.py	2021-02-01 11:14:25 +0000
+++ rabbitfixture/server.py	2021-02-01 11:49:40 +0000
@@ -12,6 +12,7 @@
     "RabbitServerResources",
     ]
 
+from contextlib import contextmanager
 import errno
 import logging
 import os
@@ -309,6 +310,34 @@
         else:
             raise Exception("RabbitMQ server is not running.")
 
+    @contextmanager
+    def _handle_sigchld(self):
+        # The rabbitmq-server process we're trying to stop is our direct
+        # child process, so we need to handle SIGCHLD in order for the
+        # process to go away gracefully.
+        def sigchld_handler(signum, frame):
+            while True:
+                try:
+                    pid, _ = os.waitpid(-1, os.WNOHANG)
+                    if not pid:
+                        break
+                except OSError as e:
+                    if e.errno == errno.ECHILD:
+                        break
+                    raise
+
+        original_sigchld = signal.signal(signal.SIGCHLD, sigchld_handler)
+        if original_sigchld is None:
+            logging.warning(
+                "Previous SIGCHLD handler was installed by non-Python code; "
+                "will restore to default action instead.")
+            original_sigchld = signal.SIG_DFL
+
+        try:
+            yield
+        finally:
+            signal.signal(signal.SIGCHLD, original_sigchld)
+
     def kill(self):
         """Kill the RabbitMQ server process.
 
@@ -319,10 +348,11 @@
         It is also useful to test your code against scenarios where the server
         dies.
         """
-        self._signal(signal.SIGKILL)
-        time.sleep(0.5)
-        if self.is_running():
-            raise Exception("RabbitMQ server just won't die.")
+        with self._handle_sigchld():
+            self._signal(signal.SIGKILL)
+            time.sleep(0.5)
+            if self.is_running():
+                raise Exception("RabbitMQ server just won't die.")
 
     def _spawn(self):
         """Spawn the RabbitMQ server process."""
@@ -387,29 +417,7 @@
 
     def _stop(self):
         """Stop the running server. Normally called by cleanups."""
-        def handle_sigchld(signum, frame):
-            while True:
-                try:
-                    pid, _ = os.waitpid(-1, os.WNOHANG)
-                    if not pid:
-                        break
-                except OSError as e:
-                    if e.errno == errno.ECHILD:
-                        break
-                    raise
-
-        original_sigchld = None
-        try:
-            # The rabbitmq-server process we're trying to stop is our direct
-            # child process, so we need to handle SIGCHLD in order for the
-            # process to go away gracefully.
-            original_sigchld = signal.signal(signal.SIGCHLD, handle_sigchld)
-            if original_sigchld is None:
-                logging.warning(
-                    "Previous SIGCHLD handler was installed by non-Python "
-                    "code; will restore to default action instead.")
-                original_sigchld = signal.SIG_DFL
-
+        with self._handle_sigchld():
             try:
                 self._request_stop()
                 # Wait for the node to go down...
@@ -436,9 +444,6 @@
                 # Die!!!
                 if self.is_running():
                     self.kill()
-        finally:
-            if original_sigchld is not None:
-                signal.signal(signal.SIGCHLD, original_sigchld)
 
     def _signal(self, code):
         """Send a signal to the server process and all its children."""