Skip to content

[2.7] bpo-31593: test_socketserver waits child processes #3786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Sep 27, 2017
Merged

[2.7] bpo-31593: test_socketserver waits child processes #3786

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions Lib/test/test_socketserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,20 @@ def simple_subprocess(testcase):
testcase.assertEqual(72 << 8, status)


def close_server(server):
server.server_close()

if hasattr(server, 'active_children'):
# ForkingMixIn: Manually reap all child processes, since server_close()
# calls waitpid() in non-blocking mode using the WNOHANG flag.
for pid in server.active_children.copy():
try:
os.waitpid(pid, 0)
except ChildProcessError:
pass
server.active_children.clear()


@unittest.skipUnless(threading, 'Threading required for this test.')
class SocketServerTest(unittest.TestCase):
"""Test all socket servers."""
Expand Down Expand Up @@ -118,7 +132,7 @@ def make_server(self, addr, svrcls, hdlrbase):
class MyServer(svrcls):
def handle_error(self, request, client_address):
self.close_request(request)
self.server_close()
close_server(self)
raise

class MyHandler(hdlrbase):
Expand Down Expand Up @@ -158,7 +172,7 @@ def run_server(self, svrcls, hdlrbase, testfunc):
if verbose: print "waiting for server"
server.shutdown()
t.join()
server.server_close()
close_server(server)
self.assertRaises(socket.error, server.socket.fileno)
if verbose: print "done"

Expand Down Expand Up @@ -314,6 +328,7 @@ class MyHandler(SocketServer.StreamRequestHandler):
s.shutdown()
for t, s in threads:
t.join()
close_server(s)

def test_tcpserver_bind_leak(self):
# Issue #22435: the server socket wouldn't be closed if bind()/listen()
Expand Down Expand Up @@ -347,7 +362,7 @@ def shutdown_request(self, request):
s.close()
server.handle_request()
self.assertEqual(server.shutdown_called, 1)
server.server_close()
close_server(server)


def test_main():
Expand Down