Merge pull request #2438 from colindickson/master

add a timeout value to connection_error_invalid_port test to accelerate failure

test_requests.py

@@ -309,7 +309,7 @@ def test_connection_error_invalid_domain(self):
     def test_connection_error_invalid_port(self):
         """Connecting to an invalid port should raise a ConnectionError"""
         with pytest.raises(ConnectionError):
-            requests.get("http://httpbin.org:1")
+            requests.get("http://httpbin.org:1", timeout=1)
 
     def test_LocationParseError(self):
         """Inputing a URL that cannot be parsed should raise an InvalidURL error"""