diff options
author | Victor Stinner <vstinner@python.org> | 2019-12-10 20:12:26 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-10 20:12:26 (GMT) |
commit | c98b0199a984430312833ef403d265be314f7244 (patch) | |
tree | 5ed60fe7dab0a90dd08b51c54082f6a320fd0693 /Lib | |
parent | bbc8b7965bb9f46763c96878326966f4231c7d39 (diff) | |
download | cpython-c98b0199a984430312833ef403d265be314f7244.zip cpython-c98b0199a984430312833ef403d265be314f7244.tar.gz cpython-c98b0199a984430312833ef403d265be314f7244.tar.bz2 |
bpo-38614: Use test.support.LONG_TIMEOUT constant (GH-17562)
Replace hardcoded timeout constants in tests with LONG_TIMEOUT of
test.support, so it's easier to ajdust this timeout for all tests at
once.
LONG_TIMEOUT is 5 minutes by default, but it can be longer depending
on --timeout command line option.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/test/_test_multiprocessing.py | 4 | ||||
-rw-r--r-- | Lib/test/test_asyncio/test_sslproto.py | 3 | ||||
-rw-r--r-- | Lib/test/test_logging.py | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py index 611291c..86f3d1c 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -295,7 +295,7 @@ class _TestProcess(BaseTestCase): target=self._test_create_grandchild_process, args=(wconn, )) p.start() - if not rconn.poll(timeout=60): + if not rconn.poll(timeout=support.LONG_TIMEOUT): raise AssertionError("Could not communicate with child process") parent_process_status = rconn.recv() self.assertEqual(parent_process_status, "alive") @@ -303,7 +303,7 @@ class _TestProcess(BaseTestCase): p.terminate() p.join() - if not rconn.poll(timeout=60): + if not rconn.poll(timeout=support.LONG_TIMEOUT): raise AssertionError("Could not communicate with child process") parent_process_status = rconn.recv() self.assertEqual(parent_process_status, "not alive") diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py index 7ba3d73..8e9d4c5 100644 --- a/Lib/test/test_asyncio/test_sslproto.py +++ b/Lib/test/test_asyncio/test_sslproto.py @@ -16,6 +16,7 @@ import asyncio from asyncio import log from asyncio import protocols from asyncio import sslproto +from test import support from test.test_asyncio import utils as test_utils from test.test_asyncio import functional as func_tests @@ -163,7 +164,7 @@ class SslProtoHandshakeTests(test_utils.TestCase): class BaseStartTLS(func_tests.FunctionalTestCaseMixin): PAYLOAD_SIZE = 1024 * 100 - TIMEOUT = 60 + TIMEOUT = support.LONG_TIMEOUT def new_loop(self): raise NotImplementedError diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 3b135b8..4feed03 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -1059,8 +1059,8 @@ if hasattr(socket, "AF_UNIX"): # - end of server_helper section class SMTPHandlerTest(BaseTest): - # bpo-14314, bpo-19665, bpo-34092: don't wait forever, timeout of 1 minute - TIMEOUT = 60.0 + # bpo-14314, bpo-19665, bpo-34092: don't wait forever + TIMEOUT = support.LONG_TIMEOUT def test_basic(self): sockmap = {} |