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

Read HTTP response inside transient_internet()

This commit is contained in:
Antoine Pitrou 2011-03-26 18:38:06 +01:00
parent 006ba5c165 b651949f53
commit d9faa201ce
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/test/test_urllibnet.py
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
@ -24,7 +25,7 @@ class URLTimeoutTest(unittest.TestCase):
def testURLread(self): def testURLread(self):
with support.transient_internet("www.python.org"): with support.transient_internet("www.python.org"):
f = urllib.request.urlopen("http://www.python.org/") f = urllib.request.urlopen("http://www.python.org/")
x = f.read() x = f.read()
class urlopenNetworkTests(unittest.TestCase): class urlopenNetworkTests(unittest.TestCase):
"""Tests urllib.reqest.urlopen using the network. """Tests urllib.reqest.urlopen using the network.
@ -43,8 +44,10 @@ 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)
return urllib.request.urlopen(*args, **kwargs) cm.__enter__()
self.addCleanup(cm.__exit__, None, None, None)
return urllib.request.urlopen(*args, **kwargs)
def test_basic(self): def test_basic(self):
# Simple test expected to pass. # Simple test expected to pass.
@ -135,8 +138,10 @@ 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)
return urllib.request.urlretrieve(*args) cm.__enter__()
self.addCleanup(cm.__exit__, None, None, None)
return urllib.request.urlretrieve(*args)
def test_basic(self): def test_basic(self):
# Test basic functionality. # Test basic functionality.