Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 3.4 (test_urllib2net)

This commit is contained in:
Victor Stinner 2015-04-07 12:53:07 +02:00
parent a9dd680d23 4bea461572
commit 388bf30fe8
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_urllib2net.py
View File

@ -102,8 +102,6 @@ def test_ftp(self):
'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 @@ def test_http_timeout(self):
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())