Changeset 442c6a6 in mod_gnutls

Timestamp:

Jan 25, 2020, 6:26:19 AM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master, proxy-ticket

Children:

f4ac390e

Parents:

7543db4

Message:

Test suite: Detect Apache shutdown by PID file

Wait for the PID file to disappear instead of using signal 0. The
reason is that some container environments don't have a proper init
system which reaps the Apache process on shutdown. In that case the
process stays around as a zombie process and os.kill() reports it as
existing indefinitely.

File:

• test/mgstest/services.py (modified) (1 diff)

test/mgstest/services.py

@@ -109 +109 @@
             self.process.wait()
             self.process = None
-        elif self.pid:
-            print(f'Waiting for PID {self.pid}...', file=sys.stderr)
+        elif self.pid and self.pidfile:
+            print(f'Waiting for PID {self.pid} to delete its PID file '
+                  f'({self.pidfile})...', file=sys.stderr)
+            sys.stderr.flush()
             while True:
-                try:
-                    # signal 0 just checks if the target process exists
-                    os.kill(self.pid, 0)
+                if self.pidfile.exists():
                     sleep(self._step)
-                except OSError as e:
-                    if e.errno != errno.ESRCH:
-                        print('Unexpected exception while checking process '
-                              f'state: {e}', file=sys.stderr)
+                else:
                     break
             self.pid = None