From: Kevin Burke <kev@inburke.com>
Date: Mon, 25 Aug 2014 03:18:05 +0000 (-0700)
Subject: assert connect timeout inheritance
X-Git-Tag: v2.4.0~8^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=39b3a436d3058975ac8e05735825da03e755a3b0;p=services%2Fpython-requests.git

assert connect timeout inheritance
---

diff --git a/test_requests.py b/test_requests.py
index 21efe66..2df9736 100755
--- a/test_requests.py
+++ b/test_requests.py
@@ -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: