diff options
| author | Victor Stinner <vstinner@python.org> | 2019-12-11 10:30:03 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-11 10:30:03 (GMT) |
| commit | 0d63bacefd2e5b937ec6b0ec3053777c09941b4a (patch) | |
| tree | 638bde819a554379c8c5aff31ba8d6a1feeb1db1 /Lib/test/test_ssl.py | |
| parent | b7a0109cd2bafaa21a4d50aad307e901c68f9156 (diff) | |
| download | cpython-0d63bacefd2e5b937ec6b0ec3053777c09941b4a.zip cpython-0d63bacefd2e5b937ec6b0ec3053777c09941b4a.tar.gz cpython-0d63bacefd2e5b937ec6b0ec3053777c09941b4a.tar.bz2 | |
bpo-38614: Use test.support.SHORT_TIMEOUT constant (GH-17566)
Replace hardcoded timeout constants in tests with SHORT_TIMEOUT of
test.support, so it's easier to ajdust this timeout for all tests at
once.
SHORT_TIMEOUT is 30 seconds by default, but it can be longer
depending on --timeout command line option.
The change makes almost all timeouts longer, except
test_reap_children() of test_support which is made 2x shorter:
SHORT_TIMEOUT should be enough. If this test starts to fail,
LONG_TIMEOUT should be used instead.
Uniformize also "from test import support" import in some test files.
Diffstat (limited to 'Lib/test/test_ssl.py')
| -rw-r--r-- | Lib/test/test_ssl.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 4f70799..0093a49 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -2156,7 +2156,7 @@ class SimpleBackgroundTests(unittest.TestCase): def ssl_io_loop(self, sock, incoming, outgoing, func, *args, **kwargs): # A simple IO loop. Call func(*args) depending on the error we get # (WANT_READ or WANT_WRITE) move data between the socket and the BIOs. - timeout = kwargs.get('timeout', 10) + timeout = kwargs.get('timeout', support.SHORT_TIMEOUT) deadline = time.monotonic() + timeout count = 0 while True: |