assert connect timeout inheritance
authorKevin Burke <kev@inburke.com>
Mon, 25 Aug 2014 03:18:05 +0000 (20:18 -0700)
committerKevin Burke <kev@inburke.com>
Mon, 25 Aug 2014 03:18:05 +0000 (20:18 -0700)
test_requests.py

index 21efe6674fec44787afcd4f6e7112467ea420dd2..2df97368a2ff0cd9caf8a1315a042ad11b70611f 100755 (executable)
@@ -19,7 +19,7 @@ from requests.compat import (
     Morsel, cookielib, getproxies, str, urljoin, urlparse, is_py3, builtin_str)
 from requests.cookies import cookiejar_from_dict, morsel_to_cookie
 from requests.exceptions import (InvalidURL, MissingSchema, ConnectTimeout,
-                                 ReadTimeout)
+                                 ReadTimeout, ConnectionError, Timeout)
 from requests.models import PreparedRequest
 from requests.structures import CaseInsensitiveDict
 from requests.sessions import SessionRedirectMixin
@@ -1348,8 +1348,10 @@ class TestTimeout:
         try:
             requests.get(TARPIT, timeout=(0.1, None))
             assert False, "The connect() request should time out."
-        except ConnectTimeout:
+        except ConnectTimeout as e:
             pass
+        assert isinstance(e, ConnectionError)
+        assert isinstance(e, Timeout)
 
     def test_total_timeout_connect(self):
         try: