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.
This commit is contained in:
Victor Stinner 2019-12-10 21:12:26 +01:00 committed by GitHub
parent bbc8b7965b
commit c98b0199a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions

View file

@ -295,7 +295,7 @@ class _TestProcess(BaseTestCase):
target=self._test_create_grandchild_process, args=(wconn, )) target=self._test_create_grandchild_process, args=(wconn, ))
p.start() p.start()
if not rconn.poll(timeout=60): if not rconn.poll(timeout=support.LONG_TIMEOUT):
raise AssertionError("Could not communicate with child process") raise AssertionError("Could not communicate with child process")
parent_process_status = rconn.recv() parent_process_status = rconn.recv()
self.assertEqual(parent_process_status, "alive") self.assertEqual(parent_process_status, "alive")
@ -303,7 +303,7 @@ class _TestProcess(BaseTestCase):
p.terminate() p.terminate()
p.join() p.join()
if not rconn.poll(timeout=60): if not rconn.poll(timeout=support.LONG_TIMEOUT):
raise AssertionError("Could not communicate with child process") raise AssertionError("Could not communicate with child process")
parent_process_status = rconn.recv() parent_process_status = rconn.recv()
self.assertEqual(parent_process_status, "not alive") self.assertEqual(parent_process_status, "not alive")

View file

@ -16,6 +16,7 @@ import asyncio
from asyncio import log from asyncio import log
from asyncio import protocols from asyncio import protocols
from asyncio import sslproto from asyncio import sslproto
from test import support
from test.test_asyncio import utils as test_utils from test.test_asyncio import utils as test_utils
from test.test_asyncio import functional as func_tests from test.test_asyncio import functional as func_tests
@ -163,7 +164,7 @@ class SslProtoHandshakeTests(test_utils.TestCase):
class BaseStartTLS(func_tests.FunctionalTestCaseMixin): class BaseStartTLS(func_tests.FunctionalTestCaseMixin):
PAYLOAD_SIZE = 1024 * 100 PAYLOAD_SIZE = 1024 * 100
TIMEOUT = 60 TIMEOUT = support.LONG_TIMEOUT
def new_loop(self): def new_loop(self):
raise NotImplementedError raise NotImplementedError

View file

@ -1059,8 +1059,8 @@ if hasattr(socket, "AF_UNIX"):
# - end of server_helper section # - end of server_helper section
class SMTPHandlerTest(BaseTest): class SMTPHandlerTest(BaseTest):
# bpo-14314, bpo-19665, bpo-34092: don't wait forever, timeout of 1 minute # bpo-14314, bpo-19665, bpo-34092: don't wait forever
TIMEOUT = 60.0 TIMEOUT = support.LONG_TIMEOUT
def test_basic(self): def test_basic(self):
sockmap = {} sockmap = {}