Skip to content

bpo-45212: Fix dangling threads in skipped tests in test_socket #28361

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
merged 2 commits into from
Sep 16, 2021
Merged

bpo-45212: Fix dangling threads in skipped tests in test_socket #28361

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9906a2
bpo-45212: Fix dangling threads in skipped tests in test_socket
serhiy-storchaka Sep 15, 2021
2a37255
Fix testWithTimeoutTriggeredSend.
serhiy-storchaka Sep 16, 2021
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
19 changes: 8 additions & 11 deletions Lib/test/test_socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,7 @@ def _testFoo(self):
def __init__(self):
# Swap the true setup function
self.__setUp = self.setUp
self.__tearDown = self.tearDown
self.setUp = self._setUp
self.tearDown = self._tearDown

def serverExplicitReady(self):
"""This method allows the server to explicitly indicate that
Expand All @@ -340,13 +338,19 @@ def serverExplicitReady(self):
def _setUp(self):
self.wait_threads = threading_helper.wait_threads_exit()
self.wait_threads.__enter__()
self.addCleanup(self.wait_threads.__exit__, None, None, None)

self.server_ready = threading.Event()
self.client_ready = threading.Event()
self.done = threading.Event()
self.queue = queue.Queue(1)
self.server_crashed = False

def raise_queued_exception():
if self.queue.qsize():
raise self.queue.get()
self.addCleanup(raise_queued_exception)

# Do some munging to start the client test.
methodname = self.id()
i = methodname.rfind('.')
Expand All @@ -363,15 +367,7 @@ def _setUp(self):
finally:
self.server_ready.set()
self.client_ready.wait()

def _tearDown(self):
self.__tearDown()
self.done.wait()
self.wait_threads.__exit__(None, None, None)

if self.queue.qsize():
exc = self.queue.get()
raise exc
self.addCleanup(self.done.wait)

def clientRun(self, test_func):
self.server_ready.wait()
Expand Down Expand Up @@ -6211,6 +6207,7 @@ def _testWithTimeoutTriggeredSend(self):
def testWithTimeoutTriggeredSend(self):
conn = self.accept_conn()
conn.recv(88192)
time.sleep(1)

# errors

Expand Down