Read HTTP response inside transient_internet()

This commit is contained in:
Antoine Pitrou 2011-03-26 18:38:06 +01:00
commit d9faa201ce

View file

@ -12,6 +12,7 @@ import time
class URLTimeoutTest(unittest.TestCase): class URLTimeoutTest(unittest.TestCase):
# XXX this test doesn't seem to test anything useful.
TIMEOUT = 30.0 TIMEOUT = 30.0
@ -43,7 +44,9 @@ class urlopenNetworkTests(unittest.TestCase):
def urlopen(self, *args, **kwargs): def urlopen(self, *args, **kwargs):
resource = args[0] resource = args[0]
with support.transient_internet(resource): cm = support.transient_internet(resource)
cm.__enter__()
self.addCleanup(cm.__exit__, None, None, None)
return urllib.request.urlopen(*args, **kwargs) return urllib.request.urlopen(*args, **kwargs)
def test_basic(self): def test_basic(self):
@ -135,7 +138,9 @@ class urlretrieveNetworkTests(unittest.TestCase):
def urlretrieve(self, *args): def urlretrieve(self, *args):
resource = args[0] resource = args[0]
with support.transient_internet(resource): cm = support.transient_internet(resource)
cm.__enter__()
self.addCleanup(cm.__exit__, None, None, None)
return urllib.request.urlretrieve(*args) return urllib.request.urlretrieve(*args)
def test_basic(self): def test_basic(self):