diff options
| author | Victor Stinner <vstinner@python.org> | 2019-12-10 21:09:23 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 21:09:23 (GMT) |
| commit | 1d0f9b316a290f0e1f330fdbceb027deb96ce109 (patch) | |
| tree | aa11a994386b9fb60f07d161810a4c4399775a03 /Lib/test/test_nntplib.py | |
| parent | c98b0199a984430312833ef403d265be314f7244 (diff) | |
| download | cpython-1d0f9b316a290f0e1f330fdbceb027deb96ce109.zip cpython-1d0f9b316a290f0e1f330fdbceb027deb96ce109.tar.gz cpython-1d0f9b316a290f0e1f330fdbceb027deb96ce109.tar.bz2 | |
bpo-38614: Use test.support.INTERNET_TIMEOUT constant (GH-17565)
Replace hardcoded timeout constants in tests with INTERNET_TIMEOUT of
test.support, so it's easier to ajdust this timeout for all tests at
once.
Diffstat (limited to 'Lib/test/test_nntplib.py')
| -rw-r--r-- | Lib/test/test_nntplib.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py index 618b403..daa4a79 100644 --- a/Lib/test/test_nntplib.py +++ b/Lib/test/test_nntplib.py @@ -19,7 +19,6 @@ except ImportError: ssl = None -TIMEOUT = 30 certfile = os.path.join(os.path.dirname(__file__), 'keycert3.pem') if ssl is not None: @@ -270,12 +269,18 @@ class NetworkedNNTPTestsMixin: return True try: - with self.NNTP_CLASS(self.NNTP_HOST, timeout=TIMEOUT, usenetrc=False) as server: + server = self.NNTP_CLASS(self.NNTP_HOST, + timeout=support.INTERNET_TIMEOUT, + usenetrc=False) + with server: self.assertTrue(is_connected()) self.assertTrue(server.help()) self.assertFalse(is_connected()) - with self.NNTP_CLASS(self.NNTP_HOST, timeout=TIMEOUT, usenetrc=False) as server: + server = self.NNTP_CLASS(self.NNTP_HOST, + timeout=support.INTERNET_TIMEOUT, + usenetrc=False) + with server: server.quit() self.assertFalse(is_connected()) except SSLError as ssl_err: @@ -307,7 +312,8 @@ class NetworkedNNTPTests(NetworkedNNTPTestsMixin, unittest.TestCase): support.requires("network") with support.transient_internet(cls.NNTP_HOST): try: - cls.server = cls.NNTP_CLASS(cls.NNTP_HOST, timeout=TIMEOUT, + cls.server = cls.NNTP_CLASS(cls.NNTP_HOST, + timeout=support.INTERNET_TIMEOUT, usenetrc=False) except SSLError as ssl_err: # matches "[SSL: DH_KEY_TOO_SMALL] dh key too small" |