traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent this test from failing if there are transient network problems 

by retrying the host for up to 3 times.
This commit is contained in:
Neal Norwitz 2008-01-26 05:54:48 +00:00
parent 00417a3b5d
commit 5be3067742
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Lib/test/test_urllibnet.py
View File

@ -9,6 +9,20 @@ import sys
import os import os
import mimetools import mimetools
def _open_with_retry(func, host, *args, **kwargs):
# Connecting to remote hosts is flaky. Make it more robust
# by retrying the connection several times.
for i in range(3):
try:
return func(host, *args, **kwargs)
except IOError, last_exc:
continue
except:
raise
raise last_exc
class URLTimeoutTest(unittest.TestCase): class URLTimeoutTest(unittest.TestCase):
TIMEOUT = 10.0 TIMEOUT = 10.0
@ -20,7 +34,7 @@ class URLTimeoutTest(unittest.TestCase):
socket.setdefaulttimeout(None) socket.setdefaulttimeout(None)
def testURLread(self): def testURLread(self):
f = urllib.urlopen("http://www.python.org/") f = _open_with_retry(urllib.urlopen, "http://www.python.org/")
x = f.read() x = f.read()
class urlopenNetworkTests(unittest.TestCase): class urlopenNetworkTests(unittest.TestCase):
@ -38,9 +52,12 @@ class urlopenNetworkTests(unittest.TestCase):
""" """
def urlopen(self, *args):
return _open_with_retry(urllib.urlopen, *args)
def test_basic(self): def test_basic(self):
# Simple test expected to pass. # Simple test expected to pass.
open_url = urllib.urlopen("http://www.python.org/") open_url = self.urlopen("http://www.python.org/")
for attr in ("read", "readline", "readlines", "fileno", "close", for attr in ("read", "readline", "readlines", "fileno", "close",
"info", "geturl"): "info", "geturl"):
self.assert_(hasattr(open_url, attr), "object returned from " self.assert_(hasattr(open_url, attr), "object returned from "
@ -52,7 +69,7 @@ class urlopenNetworkTests(unittest.TestCase):
def test_readlines(self): def test_readlines(self):
# Test both readline and readlines. # Test both readline and readlines.
open_url = urllib.urlopen("http://www.python.org/") open_url = self.urlopen("http://www.python.org/")
try: try:
self.assert_(isinstance(open_url.readline(), basestring), self.assert_(isinstance(open_url.readline(), basestring),
"readline did not return a string") "readline did not return a string")
@ -63,7 +80,7 @@ class urlopenNetworkTests(unittest.TestCase):
def test_info(self): def test_info(self):
# Test 'info'. # Test 'info'.
open_url = urllib.urlopen("http://www.python.org/") open_url = self.urlopen("http://www.python.org/")
try: try:
info_obj = open_url.info() info_obj = open_url.info()
finally: finally:
@ -76,7 +93,7 @@ class urlopenNetworkTests(unittest.TestCase):
def test_geturl(self): def test_geturl(self):
# Make sure same URL as opened is returned by geturl. # Make sure same URL as opened is returned by geturl.
URL = "http://www.python.org/" URL = "http://www.python.org/"
open_url = urllib.urlopen(URL) open_url = self.urlopen(URL)
try: try:
gotten_url = open_url.geturl() gotten_url = open_url.geturl()
finally: finally:
@ -100,7 +117,7 @@ class urlopenNetworkTests(unittest.TestCase):
# test can't pass on Windows. # test can't pass on Windows.
return return
# Make sure fd returned by fileno is valid. # Make sure fd returned by fileno is valid.
open_url = urllib.urlopen("http://www.python.org/") open_url = self.urlopen("http://www.python.org/")
fd = open_url.fileno() fd = open_url.fileno()
FILE = os.fdopen(fd) FILE = os.fdopen(fd)
try: try:
@ -125,9 +142,12 @@ class urlopenNetworkTests(unittest.TestCase):
class urlretrieveNetworkTests(unittest.TestCase): class urlretrieveNetworkTests(unittest.TestCase):
"""Tests urllib.urlretrieve using the network.""" """Tests urllib.urlretrieve using the network."""
def urlretrieve(self, *args):
return _open_with_retry(urllib.urlretrieve, *args)
def test_basic(self): def test_basic(self):
# Test basic functionality. # Test basic functionality.
file_location,info = urllib.urlretrieve("http://www.python.org/") file_location,info = self.urlretrieve("http://www.python.org/")
self.assert_(os.path.exists(file_location), "file location returned by" self.assert_(os.path.exists(file_location), "file location returned by"
" urlretrieve is not a valid path") " urlretrieve is not a valid path")
FILE = file(file_location) FILE = file(file_location)
@ -140,8 +160,8 @@ class urlretrieveNetworkTests(unittest.TestCase):
def test_specified_path(self): def test_specified_path(self):
# Make sure that specifying the location of the file to write to works. # Make sure that specifying the location of the file to write to works.
file_location,info = urllib.urlretrieve("http://www.python.org/", file_location,info = self.urlretrieve("http://www.python.org/",
test_support.TESTFN) test_support.TESTFN)
self.assertEqual(file_location, test_support.TESTFN) self.assertEqual(file_location, test_support.TESTFN)
self.assert_(os.path.exists(file_location)) self.assert_(os.path.exists(file_location))
FILE = file(file_location) FILE = file(file_location)
@ -153,7 +173,7 @@ class urlretrieveNetworkTests(unittest.TestCase):
def test_header(self): def test_header(self):
# Make sure header returned as 2nd value from urlretrieve is good. # Make sure header returned as 2nd value from urlretrieve is good.
file_location, header = urllib.urlretrieve("http://www.python.org/") file_location, header = self.urlretrieve("http://www.python.org/")
os.unlink(file_location) os.unlink(file_location)
self.assert_(isinstance(header, mimetools.Message), self.assert_(isinstance(header, mimetools.Message),
"header is not an instance of mimetools.Message") "header is not an instance of mimetools.Message")