From: Victor Stinner <vstinner@python.org>
Date: Tue, 10 Dec 2019 21:09:23 +0000 (+0100)
Subject: bpo-38614: Use test.support.INTERNET_TIMEOUT constant (GH-17565)
X-Git-Tag: v3.9.0a2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d0f9b316a290f0e1f330fdbceb027deb96ce109;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py
index 618b403bfb5b..daa4a7945c1f 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"
diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
index bb0500e12a49..b3a5e8974df3 100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -10,8 +10,6 @@ import sys
 
 support.requires("network")
 
-TIMEOUT = 60  # seconds
-
 
 def _retry_thrice(func, exc, *args, **kwargs):
     for i in range(3):
@@ -227,7 +225,7 @@ class OtherNetworkTests(unittest.TestCase):
 
                 with support.transient_internet(url):
                     try:
-                        f = urlopen(url, req, TIMEOUT)
+                        f = urlopen(url, req, support.INTERNET_TIMEOUT)
                     # urllib.error.URLError is a subclass of OSError
                     except OSError as err:
                         if expected_err:
diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
index 848ab84bc408..422d529a7007 100644
--- a/Lib/test/test_urllibnet.py
+++ b/Lib/test/test_urllibnet.py
@@ -16,10 +16,8 @@ support.requires('network')
 class URLTimeoutTest(unittest.TestCase):
     # XXX this test doesn't seem to test anything useful.
 
-    TIMEOUT = 30.0
-
     def setUp(self):
-        socket.setdefaulttimeout(self.TIMEOUT)
+        socket.setdefaulttimeout(support.INTERNET_TIMEOUT)
 
     def tearDown(self):
         socket.setdefaulttimeout(None)