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_asyncore.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_asyncore.py')
| -rw-r--r-- | Lib/test/test_asyncore.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py index 3fcedb5..6c84ac4 100644 --- a/Lib/test/test_asyncore.py +++ b/Lib/test/test_asyncore.py @@ -16,7 +16,6 @@ if support.PGO: raise unittest.SkipTest("test is not helpful for PGO") -TIMEOUT = 3 HAS_UNIX_SOCKETS = hasattr(socket, 'AF_UNIX') class dummysocket: @@ -360,7 +359,7 @@ class DispatcherWithSendTests(unittest.TestCase): self.assertEqual(cap.getvalue(), data*2) finally: - support.join_thread(t, timeout=TIMEOUT) + support.join_thread(t) @unittest.skipUnless(hasattr(asyncore, 'file_wrapper'), @@ -788,7 +787,7 @@ class BaseTestAPI: except OSError: pass finally: - support.join_thread(t, timeout=TIMEOUT) + support.join_thread(t) class TestAPI_UseIPv4Sockets(BaseTestAPI): family = socket.AF_INET |