From aa8ec34ad52bb3b274ce91169e1bc4a598655049 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 10 Aug 2017 15:28:16 +0200 Subject: bpo-31151: Add socketserver.ForkingMixIn.server_close() (#3057) * Add socketserver.ForkingMixIn.server_close() bpo-31151: socketserver.ForkingMixIn.server_close() now waits until all child processes completed to prevent leaking zombie processes. * Fix test on Windows which doesn't have ForkingMixIn --- Lib/test/test_socketserver.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Lib/test/test_socketserver.py') diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py index 140a6abf9e..3d93566607 100644 --- a/Lib/test/test_socketserver.py +++ b/Lib/test/test_socketserver.py @@ -144,6 +144,10 @@ class SocketServerTest(unittest.TestCase): t.join() server.server_close() self.assertEqual(-1, server.socket.fileno()) + if HAVE_FORKING and isinstance(server, socketserver.ForkingMixIn): + # bpo-31151: Check that ForkingMixIn.server_close() waits until + # all children completed + self.assertFalse(server.active_children) if verbose: print("done") def stream_examine(self, proto, addr): @@ -371,10 +375,7 @@ class ThreadingErrorTestServer(socketserver.ThreadingMixIn, if HAVE_FORKING: class ForkingErrorTestServer(socketserver.ForkingMixIn, BaseErrorTestServer): - def wait_done(self): - [child] = self.active_children - os.waitpid(child, 0) - self.active_children.clear() + pass class SocketWriterTest(unittest.TestCase): -- cgit v1.2.1