mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Get this test to pass

Browse source
This commit is contained in:
Neal Norwitz 2008-01-26 19:49:41 +00:00
parent e3777b4e92
commit 2f14258196
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/test/test_urllib2net.py
View file

@ -17,7 +17,8 @@ def _urlopen_with_retry(host, *args, **kwargs):
for i in range(3): for i in range(3):
try: try:
return urllib2.urlopen(host, *args, **kwargs) return urllib2.urlopen(host, *args, **kwargs)
except urllib2.URLError as last_exc: except urllib2.URLError as e:
last_exc = e
continue continue
except: except:
raise raise
@ -310,13 +311,13 @@ class TimeoutTest(unittest.TestCase):
socket.setdefaulttimeout(60) socket.setdefaulttimeout(60)
try: try:
u = _urlopen_with_retry(self.FTP_HOST, timeout=None) u = _urlopen_with_retry(self.FTP_HOST, timeout=None)
self.assertEqual(u.fp.fp._sock.gettimeout(), 60) self.assertEqual(u.fp.fp.raw._sock.gettimeout(), 60)
finally: finally:
socket.setdefaulttimeout(prev) socket.setdefaulttimeout(prev)
def test_ftp_NoneNodefault(self): def test_ftp_NoneNodefault(self):
u = _urlopen_with_retry(self.FTP_HOST, timeout=None) u = _urlopen_with_retry(self.FTP_HOST, timeout=None)
self.assertTrue(u.fp.fp._sock.gettimeout() is None) self.assertTrue(u.fp.fp.raw._sock.gettimeout() is None)
def test_ftp_Value(self): def test_ftp_Value(self):
u = _urlopen_with_retry(self.FTP_HOST, timeout=60) u = _urlopen_with_retry(self.FTP_HOST, timeout=60)