Merge pull request #1974 from Sineaggi/add-chunked-to-list-of-retryable-exceptions

nejch · web-flow · commit 07a16af33c6d · 2022-04-14T11:43:55.000+02:00
Add ChunkedEncodingError to list of retryable exceptions
diff --git a/gitlab/client.py b/gitlab/client.py
@@ -701,7 +701,7 @@ def http_request(
                     stream=streamed,
                     **opts,
                 )
-            except requests.ConnectionError:
+            except (requests.ConnectionError, requests.exceptions.ChunkedEncodingError):
                 if retry_transient_errors and (
                     max_retries == -1 or cur_retries < max_retries
                 ):
diff --git a/tests/unit/test_gitlab_http_methods.py b/tests/unit/test_gitlab_http_methods.py
@@ -102,7 +102,16 @@ def request_callback(request):
 
 
 @responses.activate
-def test_http_request_with_retry_on_method_for_transient_network_failures(gl):
+@pytest.mark.parametrize(
+    "exception",
+    [
+        requests.ConnectionError("Connection aborted."),
+        requests.exceptions.ChunkedEncodingError("Connection broken."),
+    ],
+)
+def test_http_request_with_retry_on_method_for_transient_network_failures(
+    gl, exception
+):
     call_count = 0
     calls_before_success = 3
 
@@ -117,7 +126,7 @@ def request_callback(request):
 
         if call_count >= calls_before_success:
             return (status_code, headers, body)
-        raise requests.ConnectionError("Connection aborted.")
+        raise exception
 
     responses.add_callback(
         method=responses.GET,

Original file line number	Diff line number	Diff line change
`@@ -701,7 +701,7 @@ def http_request(`
`701`	`701`	`stream=streamed,`
`702`	`702`	`**opts,`
`703`	`703`	`)`
`704`		`- except requests.ConnectionError:`
	`704`	`+ except (requests.ConnectionError, requests.exceptions.ChunkedEncodingError):`
`705`	`705`	`if retry_transient_errors and (`
`706`	`706`	`max_retries == -1 or cur_retries < max_retries`
`707`	`707`	`):`