diff options
| author | Hugo van Kemenade <hugovk@users.noreply.github.com> | 2021-12-31 00:16:27 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-31 00:16:27 (GMT) |
| commit | 2cf7d02b99ce8cebd26d330aa8aac2ee369d4600 (patch) | |
| tree | 14c068a6188d4f20fd6e6152aa859155387eba08 /Lib | |
| parent | 82c2b54a35f85d87639201d1431ae6584b079e13 (diff) | |
| download | cpython-2cf7d02b99ce8cebd26d330aa8aac2ee369d4600.zip cpython-2cf7d02b99ce8cebd26d330aa8aac2ee369d4600.tar.gz cpython-2cf7d02b99ce8cebd26d330aa8aac2ee369d4600.tar.bz2 | |
bpo-46178: Remove/rename redundant Travis CI code (#30309)
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_urllib2net.py | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py index aa41811..04cfb49 100644 --- a/Lib/test/test_urllib2net.py +++ b/Lib/test/test_urllib2net.py @@ -28,13 +28,6 @@ def _wrap_with_retry_thrice(func, exc): return _retry_thrice(func, exc, *args, **kwargs) return wrapped -# bpo-35411: FTP tests of test_urllib2net randomly fail -# with "425 Security: Bad IP connecting" on Travis CI -skip_ftp_test_on_travis = unittest.skipIf('TRAVIS' in os.environ, - 'bpo-35411: skip FTP test ' - 'on Travis CI') - - # Connecting to remote hosts is flaky. Make it more robust by retrying # the connection several times. _urlopen_with_retry = _wrap_with_retry_thrice(urllib.request.urlopen, @@ -139,7 +132,6 @@ class OtherNetworkTests(unittest.TestCase): # XXX The rest of these tests aren't very good -- they don't check much. # They do sometimes catch some major disasters, though. - @skip_ftp_test_on_travis def test_ftp(self): urls = [ 'ftp://www.pythontest.net/README', @@ -339,7 +331,6 @@ class TimeoutTest(unittest.TestCase): FTP_HOST = 'ftp://www.pythontest.net/' - @skip_ftp_test_on_travis def test_ftp_basic(self): self.assertIsNone(socket.getdefaulttimeout()) with socket_helper.transient_internet(self.FTP_HOST, timeout=None): @@ -347,7 +338,6 @@ class TimeoutTest(unittest.TestCase): self.addCleanup(u.close) self.assertIsNone(u.fp.fp.raw._sock.gettimeout()) - @skip_ftp_test_on_travis def test_ftp_default_timeout(self): self.assertIsNone(socket.getdefaulttimeout()) with socket_helper.transient_internet(self.FTP_HOST): @@ -359,7 +349,6 @@ class TimeoutTest(unittest.TestCase): socket.setdefaulttimeout(None) self.assertEqual(u.fp.fp.raw._sock.gettimeout(), 60) - @skip_ftp_test_on_travis def test_ftp_no_timeout(self): self.assertIsNone(socket.getdefaulttimeout()) with socket_helper.transient_internet(self.FTP_HOST): @@ -371,7 +360,6 @@ class TimeoutTest(unittest.TestCase): socket.setdefaulttimeout(None) self.assertIsNone(u.fp.fp.raw._sock.gettimeout()) - @skip_ftp_test_on_travis def test_ftp_timeout(self): with socket_helper.transient_internet(self.FTP_HOST): u = _urlopen_with_retry(self.FTP_HOST, timeout=60) |