mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-38614: Use default join_thread() timeout in tests (GH-17559)

Browse source 
Tests no longer pass a timeout value to join_thread() of
test.support: use the default join_thread() timeout instead
(SHORT_TIMEOUT constant of test.support).
This commit is contained in:
Victor Stinner 2019-12-10 20:41:23 +01:00 • committed by GitHub
parent 07871b256c
commit bbc8b7965b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 26 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_queue.py
View file

@ -63,7 +63,7 @@ class BlockingTestMixin:
block_func)
return self.result
finally:
support.join_thread(thread, 10) # make sure the thread terminates
support.join_thread(thread) # make sure the thread terminates
# Call this instead if block_func is supposed to raise an exception.
def do_exceptional_blocking_test(self,block_func, block_args, trigger_func,
@ -79,7 +79,7 @@ class BlockingTestMixin:
self.fail("expected exception of kind %r" %
expected_exception_class)
finally:
support.join_thread(thread, 10) # make sure the thread terminates
support.join_thread(thread) # make sure the thread terminates
if not thread.startedEvent.is_set():
self.fail("trigger thread ended but event never set")