fix: retry client side requests timeout (#319)

cojenco · web-flow · commit 787baa740064 · 2022-03-23T14:12:23.000-07:00
diff --git a/packages/google-resumable-media/google/resumable_media/requests/_request_helpers.py b/packages/google-resumable-media/google/resumable_media/requests/_request_helpers.py
@@ -37,6 +37,7 @@
 _CONNECTION_ERROR_CLASSES = (
     requests.exceptions.ConnectionError,
     requests.exceptions.ChunkedEncodingError,
+    requests.exceptions.Timeout,
     urllib3.exceptions.ProtocolError,
     ConnectionError,  # Python 3.x only, superclass of ConnectionResetError.
 )
diff --git a/packages/google-resumable-media/tests/unit/requests/test__helpers.py b/packages/google-resumable-media/tests/unit/requests/test__helpers.py
@@ -200,7 +200,8 @@ def test_success_with_retry_connection_error(self, randint_mock, sleep_mock):
     def test_success_with_retry_chunked_encoding_error(self, randint_mock, sleep_mock):
         randint_mock.side_effect = [125, 625, 375]
 
-        response = _make_response(http.client.NOT_FOUND)
+        status_code = int(http.client.OK)
+        response = _make_response(status_code)
         responses = [
             requests.exceptions.ChunkedEncodingError,
             requests.exceptions.ChunkedEncodingError,
@@ -225,6 +226,37 @@ def test_success_with_retry_chunked_encoding_error(self, randint_mock, sleep_moc
         sleep_mock.assert_any_call(1.125)
         sleep_mock.assert_any_call(2.625)
 
+    @mock.patch(u"time.sleep")
+    @mock.patch(u"random.randint")
+    def test_success_with_retry_client_timeout(self, randint_mock, sleep_mock):
+        randint_mock.side_effect = [125, 625, 375]
+
+        status_code = int(http.client.OK)
+        response = _make_response(status_code)
+        responses = [
+            requests.exceptions.Timeout,
+            requests.exceptions.Timeout,
+            response,
+        ]
+        func = mock.Mock(side_effect=responses, spec=[])
+
+        retry_strategy = common.RetryStrategy()
+        ret_val = _request_helpers.wait_and_retry(
+            func, _get_status_code, retry_strategy
+        )
+
+        assert ret_val == responses[-1]
+
+        assert func.call_count == 3
+        assert func.mock_calls == [mock.call()] * 3
+
+        assert randint_mock.call_count == 2
+        assert randint_mock.mock_calls == [mock.call(0, 1000)] * 2
+
+        assert sleep_mock.call_count == 2
+        sleep_mock.assert_any_call(1.125)
+        sleep_mock.assert_any_call(2.625)
+
     @mock.patch("time.sleep")
     @mock.patch("random.randint")
     def test_retry_exceeds_max_cumulative(self, randint_mock, sleep_mock):

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@`
`37`	`37`	`_CONNECTION_ERROR_CLASSES = (`
`38`	`38`	`requests.exceptions.ConnectionError,`
`39`	`39`	`requests.exceptions.ChunkedEncodingError,`
	`40`	`+ requests.exceptions.Timeout,`
`40`	`41`	`urllib3.exceptions.ProtocolError,`
`41`	`42`	`ConnectionError, # Python 3.x only, superclass of ConnectionResetError.`
`42`	`43`	`)`