Skip to content

C
cpython
Commit 388bf30f authored by Victor Stinner's avatar Victor Stinner
Browse files
Options

Merge 3.4 (test_urllib2net)

parents a9dd680d 4bea4615
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
Lib/test/test_urllib2net.py
View file @ 388bf30f
...@@ -102,8 +102,6 @@ class OtherNetworkTests(unittest.TestCase): ...@@ -102,8 +102,6 @@ class OtherNetworkTests(unittest.TestCase):
'ftp://ftp.debian.org/debian/README', 'ftp://ftp.debian.org/debian/README',
('ftp://ftp.debian.org/debian/non-existent-file', ('ftp://ftp.debian.org/debian/non-existent-file',
None, urllib.error.URLError), None, urllib.error.URLError),
'ftp://gatekeeper.research.compaq.com/pub/DEC/SRC'
'/research-reports/00README-Legal-Rules-Regs',
] ]
self._test_urls(urls, self._extra_handlers()) self._test_urls(urls, self._extra_handlers())
...@@ -291,7 +289,7 @@ class TimeoutTest(unittest.TestCase): ...@@ -291,7 +289,7 @@ class TimeoutTest(unittest.TestCase):
self.addCleanup(u.close) self.addCleanup(u.close)
self.assertEqual(u.fp.raw._sock.gettimeout(), 120) self.assertEqual(u.fp.raw._sock.gettimeout(), 120)
FTP_HOST = "ftp://ftp.mirror.nl/pub/gnu/" FTP_HOST = 'ftp://ftp.debian.org/debian/'
def test_ftp_basic(self): def test_ftp_basic(self):
self.assertIsNone(socket.getdefaulttimeout()) self.assertIsNone(socket.getdefaulttimeout())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7