Add timeout to stream with testing

Fixes Issue #1803
psf · Feb 28, 2014 · 930f03c · 930f03c
1 parent e909a92
commit 930f03c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/requests/adapters.py b/requests/adapters.py
@@ -310,10 +310,7 @@ def send(self, request, stream=False, timeout=None, verify=True, cert=None, prox
 
         chunked = not (request.body is None or 'Content-Length' in request.headers)
 
-        if stream:
-            timeout = TimeoutSauce(connect=timeout)
-        else:
-            timeout = TimeoutSauce(connect=timeout, read=timeout)
+        timeout = TimeoutSauce(connect=timeout, read=timeout)
 
         try:
             if not chunked:

diff --git a/test_requests.py b/test_requests.py
@@ -1170,6 +1170,15 @@ def test_max_age_invalid_str(self):
         with pytest.raises(TypeError):
             morsel_to_cookie(morsel)
 
+class TestTimeout:
+    def test_stream_timeout(self):
+        try:
+            r = requests.get('https://httpbin.org/delay/10', timeout=5.0)
+        except requests.exceptions.Timeout as e:
+            assert 'Read timed out' in e.args[0].args[0]
+
 
 if __name__ == '__main__':
     unittest.main()
+
+