Imported Upstream version 1.10

1 files changed, 26 insertions, 2 deletions

diff --git a/test/with_dummyserver/test_proxy_poolmanager.py b/test/with_dummyserver/test_proxy_poolmanager.py
index 61eedf1..df300fe 100644
--- a/test/with_dummyserver/test_proxy_poolmanager.py
+++ b/test/with_dummyserver/test_proxy_poolmanager.py
@@ -1,13 +1,17 @@
-import unittest
 import json
 import socket
+import unittest
+
+from nose.tools import timed
 
 from dummyserver.testcase import HTTPDummyProxyTestCase
 from dummyserver.server import (
     DEFAULT_CA, DEFAULT_CA_BAD, get_unreachable_address)
+from .. import TARPIT_HOST
 
 from urllib3.poolmanager import proxy_from_url, ProxyManager
-from urllib3.exceptions import MaxRetryError, SSLError, ProxyError
+from urllib3.exceptions import (
+    MaxRetryError, SSLError, ProxyError, ConnectTimeoutError)
 from urllib3.connectionpool import connection_from_url, VerifiedHTTPSConnection
 
 
@@ -259,5 +263,25 @@ class TestHTTPProxyManager(HTTPDummyProxyTestCase):
         self.assertEqual(sc3,sc4)
 
 
+    @timed(0.5)
+    def test_https_proxy_timeout(self):
+        https = proxy_from_url('https://{host}'.format(host=TARPIT_HOST))
+        try:
+            https.request('GET', self.http_url, timeout=0.001)
+            self.fail("Failed to raise retry error.")
+        except MaxRetryError as e:
+            assert isinstance(e.reason, ConnectTimeoutError)
+
+
+    @timed(0.5)
+    def test_https_proxy_pool_timeout(self):
+        https = proxy_from_url('https://{host}'.format(host=TARPIT_HOST),
+                               timeout=0.001)
+        try:
+            https.request('GET', self.http_url)
+            self.fail("Failed to raise retry error.")
+        except MaxRetryError as e:
+            assert isinstance(e.reason, ConnectTimeoutError)
+
 if __name__ == '__main__':
     unittest.main()