summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_sched.py
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2019-12-10 19:41:23 (GMT)
committerGitHub <noreply@github.com>2019-12-10 19:41:23 (GMT)
commitbbc8b7965bb9f46763c96878326966f4231c7d39 (patch)
treef9dfe1e3637a9c2805e8757a5abc75bdd0e47352 /Lib/test/test_sched.py
parent07871b256c76ca561554d1f82b430fc64a5c7ee0 (diff)
downloadcpython-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_sched.py')
-rw-r--r--Lib/test/test_sched.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_sched.py b/Lib/test/test_sched.py
index 3f84af2..f78944f 100644
--- a/Lib/test/test_sched.py
+++ b/Lib/test/test_sched.py
@@ -82,7 +82,7 @@ class TestCase(unittest.TestCase):
self.assertEqual(q.get(timeout=TIMEOUT), 5)
self.assertTrue(q.empty())
timer.advance(1000)
- support.join_thread(t, timeout=TIMEOUT)
+ support.join_thread(t)
self.assertTrue(q.empty())
self.assertEqual(timer.time(), 5)
@@ -137,7 +137,7 @@ class TestCase(unittest.TestCase):
self.assertEqual(q.get(timeout=TIMEOUT), 4)
self.assertTrue(q.empty())
timer.advance(1000)
- support.join_thread(t, timeout=TIMEOUT)
+ support.join_thread(t)
self.assertTrue(q.empty())
self.assertEqual(timer.time(), 4)