[Python-checkins] cpython (merge 3.2 -> 3.2): Read HTTP response inside transient_internet() (original) (raw)
antoine.pitrou python-checkins at python.org
Sat Mar 26 18:40:04 CET 2011
- Previous message: [Python-checkins] cpython (3.2): test_urllibnet: make it so that transient_internet() applies to the
- Next message: [Python-checkins] cpython (merge 3.2 -> default): Merge from 3.2
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
http://hg.python.org/cpython/rev/aa46bdbe641d changeset: 68973:aa46bdbe641d branch: 3.2 parent: 68970:f144ed91acfb parent: 68972:b65f417dd266 user: Antoine Pitrou <solipsis at pitrou.net> date: Sat Mar 26 18:38:06 2011 +0100 summary: Read HTTP response inside transient_internet()
files: Lib/test/test_urllibnet.py | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py --- a/Lib/test/test_urllibnet.py +++ b/Lib/test/test_urllibnet.py @@ -12,6 +12,7 @@
class URLTimeoutTest(unittest.TestCase):
TIMEOUT = 30.0 XXX this test doesn't seem to test anything useful.
@@ -24,7 +25,7 @@ def testURLread(self): with support.transient_internet("www.python.org"): f = urllib.request.urlopen("http://www.python.org/")
x = f.read()
x = f.read()
class urlopenNetworkTests(unittest.TestCase): """Tests urllib.reqest.urlopen using the network. @@ -43,8 +44,10 @@
def urlopen(self, *args, **kwargs):
resource = args[0]
with support.transient_internet(resource):
return urllib.request.urlopen(*args, **kwargs)
cm = support.transient_internet(resource)
cm.__enter__()
self.addCleanup(cm.__exit__, None, None, None)
def test_basic(self): # Simple test expected to pass.return urllib.request.urlopen(*args, **kwargs)
@@ -135,8 +138,10 @@
def urlretrieve(self, *args):
resource = args[0]
with support.transient_internet(resource):
return urllib.request.urlretrieve(*args)
cm = support.transient_internet(resource)
cm.__enter__()
self.addCleanup(cm.__exit__, None, None, None)
def test_basic(self): # Test basic functionality.return urllib.request.urlretrieve(*args)
-- Repository URL: http://hg.python.org/cpython
- Previous message: [Python-checkins] cpython (3.2): test_urllibnet: make it so that transient_internet() applies to the
- Next message: [Python-checkins] cpython (merge 3.2 -> default): Merge from 3.2
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]