mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fix for issue5102, timeout value propages between redirects, proxy, digest and

Browse source 
auth handlers. Fixed tests to reflect the same.
This commit is contained in:
Senthil Kumaran 2009-07-19 04:20:12 +00:00
parent 10fc39563c
commit e9da06f574
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/test_urllib2.py
View file

@ -222,8 +222,8 @@ def test_password_manager_default_port(self):
class MockOpener:
addheaders = []
def open(self, req, data=None):
self.req, self.data = req, data
def open(self, req, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT):
self.req, self.data, self.timeout = req, data, timeout
def error(self, proto, *args):
self.proto, self.args = proto, args
@ -854,6 +854,7 @@ class HandlerTests(unittest.TestCase):
for data in None, "blah\nblah\n":
method = getattr(h, "http_error_%s" % code)
req = Request(from_url, data)
req.timeout = socket._GLOBAL_DEFAULT_TIMEOUT
req.add_header("Nonsense", "viking=withhold")
if data is not None:
req.add_header("Content-Length", str(len(data)))
@ -883,6 +884,7 @@ class HandlerTests(unittest.TestCase):
# loop detection
req = Request(from_url)
req.timeout = socket._GLOBAL_DEFAULT_TIMEOUT
def redirect(h, req, url=to_url):
h.http_error_302(req, MockFile(), 302, "Blah",
MockHeaders({"location": url}))
@ -892,6 +894,7 @@ class HandlerTests(unittest.TestCase):
# detect infinite loop redirect of a URL to itself
req = Request(from_url, origin_req_host="example.com")
count = 0
req.timeout = socket._GLOBAL_DEFAULT_TIMEOUT
try:
while 1:
redirect(h, req, "http://example.com/")
@ -903,6 +906,7 @@ class HandlerTests(unittest.TestCase):
# detect endless non-repeating chain of redirects
req = Request(from_url, origin_req_host="example.com")
count = 0
req.timeout = socket._GLOBAL_DEFAULT_TIMEOUT
try:
while 1:
redirect(h, req, "http://example.com/%d" % count)