diff options
| author | Victor Stinner <vstinner@python.org> | 2019-12-10 19:41:23 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 19:41:23 (GMT) |
| commit | bbc8b7965bb9f46763c96878326966f4231c7d39 (patch) | |
| tree | f9dfe1e3637a9c2805e8757a5abc75bdd0e47352 /Lib/test/test_queue.py | |
| parent | 07871b256c76ca561554d1f82b430fc64a5c7ee0 (diff) | |
| download | cpython-bbc8b7965bb9f46763c96878326966f4231c7d39.zip cpython-bbc8b7965bb9f46763c96878326966f4231c7d39.tar.gz cpython-bbc8b7965bb9f46763c96878326966f4231c7d39.tar.bz2 | |
bpo-38614: Use default join_thread() timeout in tests (GH-17559)
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).
Diffstat (limited to 'Lib/test/test_queue.py')
| -rw-r--r-- | Lib/test/test_queue.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_queue.py b/Lib/test/test_queue.py index 46e2a8c..d88e28a 100644 --- a/Lib/test/test_queue.py +++ b/Lib/test/test_queue.py @@ -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") |