diff options
author | Christopher Baines <mail@cbaines.net> | 2015-12-22 14:15:26 +0000 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2015-12-22 14:15:26 +0000 |
commit | 6b4e166f2475c4be0df7d82dc4d86aa43c6cb066 (patch) | |
tree | eb8f0fa0ed67f14cc5c5645f6bb12494e7966e98 /test/with_dummyserver/test_proxy_poolmanager.py | |
parent | b6983c7c258a0ce3365f7c7409f2a06a8ed70bca (diff) | |
parent | 24ae6ba32069ca15f4a163e386964a3accdccf63 (diff) | |
download | python-urllib3-6b4e166f2475c4be0df7d82dc4d86aa43c6cb066.tar python-urllib3-6b4e166f2475c4be0df7d82dc4d86aa43c6cb066.tar.gz |
merge patched into master
Diffstat (limited to 'test/with_dummyserver/test_proxy_poolmanager.py')
-rw-r--r-- | test/with_dummyserver/test_proxy_poolmanager.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/with_dummyserver/test_proxy_poolmanager.py b/test/with_dummyserver/test_proxy_poolmanager.py index b2894a8..b37d8bb 100644 --- a/test/with_dummyserver/test_proxy_poolmanager.py +++ b/test/with_dummyserver/test_proxy_poolmanager.py @@ -124,7 +124,7 @@ class TestHTTPProxyManager(HTTPDummyProxyTestCase): try: http.request('GET', '%s/redirect' % self.http_url, fields={'target': cross_host_location}, - timeout=0.1, retries=0) + timeout=1, retries=0) self.fail("We don't want to follow redirects here.") except MaxRetryError: @@ -132,7 +132,7 @@ class TestHTTPProxyManager(HTTPDummyProxyTestCase): r = http.request('GET', '%s/redirect' % self.http_url, fields={'target': '%s/echo?a=b' % self.http_url_alt}, - timeout=0.1, retries=1) + timeout=1, retries=1) self.assertNotEqual(r._pool.host, self.http_host_alt) def test_cross_protocol_redirect(self): @@ -142,7 +142,7 @@ class TestHTTPProxyManager(HTTPDummyProxyTestCase): try: http.request('GET', '%s/redirect' % self.http_url, fields={'target': cross_protocol_location}, - timeout=0.1, retries=0) + timeout=1, retries=0) self.fail("We don't want to follow redirects here.") except MaxRetryError: @@ -150,7 +150,7 @@ class TestHTTPProxyManager(HTTPDummyProxyTestCase): r = http.request('GET', '%s/redirect' % self.http_url, fields={'target': '%s/echo?a=b' % self.https_url}, - timeout=0.1, retries=1) + timeout=1, retries=1) self.assertEqual(r._pool.host, self.https_host) def test_headers(self): |