mirror of https://github.com/python/cpython
This patch moves some tests from test_urllib2_net to test_urllib2_localnet.
The moved tests use a local server rather than going out to external servers. Accepts patch from issue2429. Contributed by Jerry Seutter & Michael Foord (fuzzyman) at PyCon 2008.
This commit is contained in:
Gregory P. Smith
parent
ab364c4366
commit
0001c2ecbc
|
|
@ -1,5 +1,6 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
import mimetools
|
||||
import threading
|
||||
import urlparse
|
||||
import urllib2
|
||||
|
|
@ -216,7 +217,7 @@ class FakeProxyHandler(BaseHTTPServer.BaseHTTPRequestHandler):
|
|||
# Test cases
|
||||
|
||||
class ProxyAuthTests(unittest.TestCase):
|
||||
URL = "http://www.foo.com"
|
||||
URL = "http://localhost"
|
||||
|
||||
USER = "tester"
|
||||
PASSWD = "test123"
|
||||
|
|
@ -278,6 +279,204 @@ class ProxyAuthTests(unittest.TestCase):
|
|||
pass
|
||||
result.close()
|
||||
|
||||
|
||||
def GetRequestHandler(responses):
|
||||
|
||||
class FakeHTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
|
||||
|
||||
server_version = "TestHTTP/"
|
||||
requests = []
|
||||
headers_received = []
|
||||
port = 80
|
||||
|
||||
def do_GET(self):
|
||||
body = self.send_head()
|
||||
if body:
|
||||
self.wfile.write(body)
|
||||
|
||||
def do_POST(self):
|
||||
content_length = self.headers['Content-Length']
|
||||
post_data = self.rfile.read(int(content_length))
|
||||
self.do_GET()
|
||||
self.requests.append(post_data)
|
||||
|
||||
def send_head(self):
|
||||
FakeHTTPRequestHandler.headers_received = self.headers
|
||||
self.requests.append(self.path)
|
||||
response_code, headers, body = responses.pop(0)
|
||||
|
||||
self.send_response(response_code)
|
||||
|
||||
for (header, value) in headers:
|
||||
self.send_header(header, value % self.port)
|
||||
if body:
|
||||
self.send_header('Content-type', 'text/plain')
|
||||
self.end_headers()
|
||||
return body
|
||||
self.end_headers()
|
||||
|
||||
def log_message(self, *args):
|
||||
pass
|
||||
|
||||
|
||||
return FakeHTTPRequestHandler
|
||||
|
||||
|
||||
class TestUrlopen(unittest.TestCase):
|
||||
"""Tests urllib2.urlopen using the network.
|
||||
|
||||
These tests are not exhaustive. Assuming that testing using files does a
|
||||
good job overall of some of the basic interface features. There are no
|
||||
tests exercising the optional 'data' and 'proxies' arguments. No tests
|
||||
for transparent redirection have been written.
|
||||
"""
|
||||
|
||||
def start_server(self, responses):
|
||||
handler = GetRequestHandler(responses)
|
||||
|
||||
self.server = LoopbackHttpServerThread(handler)
|
||||
self.server.start()
|
||||
self.server.ready.wait()
|
||||
port = self.server.port
|
||||
handler.port = port
|
||||
return handler
|
||||
|
||||
|
||||
def test_redirection(self):
|
||||
expected_response = 'We got here...'
|
||||
responses = [
|
||||
(302, [('Location', 'http://localhost:%s/somewhere_else')], ''),
|
||||
(200, [], expected_response)
|
||||
]
|
||||
|
||||
handler = self.start_server(responses)
|
||||
|
||||
try:
|
||||
f = urllib2.urlopen('http://localhost:%s/' % handler.port)
|
||||
data = f.read()
|
||||
f.close()
|
||||
|
||||
self.assertEquals(data, expected_response)
|
||||
self.assertEquals(handler.requests, ['/', '/somewhere_else'])
|
||||
finally:
|
||||
self.server.stop()
|
||||
|
||||
|
||||
def test_404(self):
|
||||
expected_response = 'Bad bad bad...'
|
||||
handler = self.start_server([(404, [], expected_response)])
|
||||
|
||||
try:
|
||||
try:
|
||||
urllib2.urlopen('http://localhost:%s/weeble' % handler.port)
|
||||
except urllib2.URLError, f:
|
||||
pass
|
||||
else:
|
||||
self.fail('404 should raise URLError')
|
||||
|
||||
data = f.read()
|
||||
f.close()
|
||||
|
||||
self.assertEquals(data, expected_response)
|
||||
self.assertEquals(handler.requests, ['/weeble'])
|
||||
finally:
|
||||
self.server.stop()
|
||||
|
||||
|
||||
def test_200(self):
|
||||
expected_response = 'pycon 2008...'
|
||||
handler = self.start_server([(200, [], expected_response)])
|
||||
|
||||
try:
|
||||
f = urllib2.urlopen('http://localhost:%s/bizarre' % handler.port)
|
||||
data = f.read()
|
||||
f.close()
|
||||
|
||||
self.assertEquals(data, expected_response)
|
||||
self.assertEquals(handler.requests, ['/bizarre'])
|
||||
finally:
|
||||
self.server.stop()
|
||||
|
||||
def test_200_with_parameters(self):
|
||||
expected_response = 'pycon 2008...'
|
||||
handler = self.start_server([(200, [], expected_response)])
|
||||
|
||||
try:
|
||||
f = urllib2.urlopen('http://localhost:%s/bizarre' % handler.port, 'get=with_feeling')
|
||||
data = f.read()
|
||||
f.close()
|
||||
|
||||
self.assertEquals(data, expected_response)
|
||||
self.assertEquals(handler.requests, ['/bizarre', 'get=with_feeling'])
|
||||
finally:
|
||||
self.server.stop()
|
||||
|
||||
|
||||
def test_sending_headers(self):
|
||||
handler = self.start_server([(200, [], "we don't care")])
|
||||
|
||||
try:
|
||||
req = urllib2.Request("http://localhost:%s/" % handler.port,
|
||||
headers={'Range': 'bytes=20-39'})
|
||||
urllib2.urlopen(req)
|
||||
self.assertEqual(handler.headers_received['Range'], 'bytes=20-39')
|
||||
finally:
|
||||
self.server.stop()
|
||||
|
||||
def test_basic(self):
|
||||
handler = self.start_server([(200, [], "we don't care")])
|
||||
|
||||
try:
|
||||
open_url = urllib2.urlopen("http://localhost:%s" % handler.port)
|
||||
for attr in ("read", "close", "info", "geturl"):
|
||||
self.assert_(hasattr(open_url, attr), "object returned from "
|
||||
"urlopen lacks the %s attribute" % attr)
|
||||
try:
|
||||
self.assert_(open_url.read(), "calling 'read' failed")
|
||||
finally:
|
||||
open_url.close()
|
||||
finally:
|
||||
self.server.stop()
|
||||
|
||||
def test_info(self):
|
||||
handler = self.start_server([(200, [], "we don't care")])
|
||||
|
||||
try:
|
||||
open_url = urllib2.urlopen("http://localhost:%s" % handler.port)
|
||||
info_obj = open_url.info()
|
||||
self.assert_(isinstance(info_obj, mimetools.Message),
|
||||
"object returned by 'info' is not an instance of "
|
||||
"mimetools.Message")
|
||||
self.assertEqual(info_obj.getsubtype(), "plain")
|
||||
finally:
|
||||
self.server.stop()
|
||||
|
||||
def test_geturl(self):
|
||||
# Make sure same URL as opened is returned by geturl.
|
||||
handler = self.start_server([(200, [], "we don't care")])
|
||||
|
||||
try:
|
||||
open_url = urllib2.urlopen("http://localhost:%s" % handler.port)
|
||||
url = open_url.geturl()
|
||||
self.assertEqual(url, "http://localhost:%s" % handler.port)
|
||||
finally:
|
||||
self.server.stop()
|
||||
|
||||
|
||||
def test_bad_address(self):
|
||||
# Make sure proper exception is raised when connecting to a bogus
|
||||
# address.
|
||||
self.assertRaises(IOError,
|
||||
# SF patch 809915: In Sep 2003, VeriSign started
|
||||
# highjacking invalid .com and .net addresses to
|
||||
# boost traffic to their own site. This test
|
||||
# started failing then. One hopes the .invalid
|
||||
# domain will be spared to serve its defined
|
||||
# purpose.
|
||||
# urllib2.urlopen, "http://www.sadflkjsasadf.com/")
|
||||
urllib2.urlopen, "http://www.python.invalid./")
|
||||
|
||||
|
||||
def test_main():
|
||||
# We will NOT depend on the network resource flag
|
||||
# (Lib/test/regrtest.py -u network) since all tests here are only
|
||||
|
|
@ -286,6 +485,7 @@ def test_main():
|
|||
#test_support.requires("network")
|
||||
|
||||
test_support.run_unittest(ProxyAuthTests)
|
||||
test_support.run_unittest(TestUrlopen)
|
||||
|
||||
if __name__ == "__main__":
|
||||
test_main()
|
||||
|
|
|
|||
|
|
@ -24,20 +24,6 @@ def _urlopen_with_retry(host, *args, **kwargs):
|
|||
raise last_exc
|
||||
|
||||
|
||||
class URLTimeoutTest(unittest.TestCase):
|
||||
|
||||
TIMEOUT = 10.0
|
||||
|
||||
def setUp(self):
|
||||
socket.setdefaulttimeout(self.TIMEOUT)
|
||||
|
||||
def tearDown(self):
|
||||
socket.setdefaulttimeout(None)
|
||||
|
||||
def testURLread(self):
|
||||
f = _urlopen_with_retry("http://www.python.org/")
|
||||
x = f.read()
|
||||
|
||||
|
||||
class AuthTests(unittest.TestCase):
|
||||
"""Tests urllib2 authentication features."""
|
||||
|
|
@ -99,68 +85,6 @@ class CloseSocketTest(unittest.TestCase):
|
|||
response.close()
|
||||
self.assert_(fileobject.closed)
|
||||
|
||||
class urlopenNetworkTests(unittest.TestCase):
|
||||
"""Tests urllib2.urlopen using the network.
|
||||
|
||||
These tests are not exhaustive. Assuming that testing using files does a
|
||||
good job overall of some of the basic interface features. There are no
|
||||
tests exercising the optional 'data' and 'proxies' arguments. No tests
|
||||
for transparent redirection have been written.
|
||||
|
||||
setUp is not used for always constructing a connection to
|
||||
http://www.python.org/ since there a few tests that don't use that address
|
||||
and making a connection is expensive enough to warrant minimizing unneeded
|
||||
connections.
|
||||
|
||||
"""
|
||||
|
||||
def test_basic(self):
|
||||
# Simple test expected to pass.
|
||||
open_url = _urlopen_with_retry("http://www.python.org/")
|
||||
for attr in ("read", "close", "info", "geturl"):
|
||||
self.assert_(hasattr(open_url, attr), "object returned from "
|
||||
"urlopen lacks the %s attribute" % attr)
|
||||
try:
|
||||
self.assert_(open_url.read(), "calling 'read' failed")
|
||||
finally:
|
||||
open_url.close()
|
||||
|
||||
def test_info(self):
|
||||
# Test 'info'.
|
||||
open_url = _urlopen_with_retry("http://www.python.org/")
|
||||
try:
|
||||
info_obj = open_url.info()
|
||||
finally:
|
||||
open_url.close()
|
||||
self.assert_(isinstance(info_obj, mimetools.Message),
|
||||
"object returned by 'info' is not an instance of "
|
||||
"mimetools.Message")
|
||||
self.assertEqual(info_obj.getsubtype(), "html")
|
||||
|
||||
def test_geturl(self):
|
||||
# Make sure same URL as opened is returned by geturl.
|
||||
URL = "http://www.python.org/"
|
||||
open_url = _urlopen_with_retry(URL)
|
||||
try:
|
||||
gotten_url = open_url.geturl()
|
||||
finally:
|
||||
open_url.close()
|
||||
self.assertEqual(gotten_url, URL)
|
||||
|
||||
def test_bad_address(self):
|
||||
# Make sure proper exception is raised when connecting to a bogus
|
||||
# address.
|
||||
self.assertRaises(IOError,
|
||||
# SF patch 809915: In Sep 2003, VeriSign started
|
||||
# highjacking invalid .com and .net addresses to
|
||||
# boost traffic to their own site. This test
|
||||
# started failing then. One hopes the .invalid
|
||||
# domain will be spared to serve its defined
|
||||
# purpose.
|
||||
# urllib2.urlopen, "http://www.sadflkjsasadf.com/")
|
||||
urllib2.urlopen, "http://www.python.invalid./")
|
||||
|
||||
|
||||
class OtherNetworkTests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
if 0: # for debugging
|
||||
|
|
@ -168,13 +92,6 @@ class OtherNetworkTests(unittest.TestCase):
|
|||
logger = logging.getLogger("test_urllib2net")
|
||||
logger.addHandler(logging.StreamHandler())
|
||||
|
||||
def test_range (self):
|
||||
req = urllib2.Request("http://www.python.org",
|
||||
headers={'Range': 'bytes=20-39'})
|
||||
result = _urlopen_with_retry(req)
|
||||
data = result.read()
|
||||
self.assertEqual(len(data), 20)
|
||||
|
||||
# XXX The rest of these tests aren't very good -- they don't check much.
|
||||
# They do sometimes catch some major disasters, though.
|
||||
|
||||
|
|
@ -202,16 +119,6 @@ class OtherNetworkTests(unittest.TestCase):
|
|||
finally:
|
||||
os.remove(TESTFN)
|
||||
|
||||
def test_http(self):
|
||||
urls = [
|
||||
'http://www.espn.com/', # redirect
|
||||
'http://www.python.org/Spanish/Inquistion/',
|
||||
('http://www.python.org/cgi-bin/faqw.py',
|
||||
'query=pythonistas&querytype=simple&casefold=yes&req=search', None),
|
||||
'http://www.python.org/',
|
||||
]
|
||||
self._test_urls(urls, self._extra_handlers())
|
||||
|
||||
# XXX Following test depends on machine configurations that are internal
|
||||
# to CNRI. Need to set up a public server with the right authentication
|
||||
# configuration for test purposes.
|
||||
|
|
@ -279,6 +186,7 @@ class OtherNetworkTests(unittest.TestCase):
|
|||
|
||||
return handlers
|
||||
|
||||
|
||||
class TimeoutTest(unittest.TestCase):
|
||||
def test_http_basic(self):
|
||||
u = _urlopen_with_retry("http://www.python.org")
|
||||
|
|
@ -327,9 +235,7 @@ class TimeoutTest(unittest.TestCase):
|
|||
|
||||
def test_main():
|
||||
test_support.requires("network")
|
||||
test_support.run_unittest(URLTimeoutTest,
|
||||
urlopenNetworkTests,
|
||||
AuthTests,
|
||||
test_support.run_unittest(AuthTests,
|
||||
OtherNetworkTests,
|
||||
CloseSocketTest,
|
||||
TimeoutTest,
|
||||
|
|
|
|||
Loading…
Reference in New Issue