fix(client): support empty 204 responses in http_patch

nejch · JohnVillalovos · commit e15349c9a796 · 2023-10-09T09:19:23.000-07:00
diff --git a/gitlab/client.py b/gitlab/client.py
@@ -1083,6 +1083,8 @@ def http_patch(
             raw=raw,
             **kwargs,
         )
+        if result.status_code in gitlab.const.NO_JSON_RESPONSE_CODES:
+            return result
         try:
             json_result = result.json()
             if TYPE_CHECKING:
diff --git a/gitlab/const.py b/gitlab/const.py
@@ -95,6 +95,7 @@ class SearchScope(GitlabEnum):
 
 USER_AGENT: str = f"{__title__}/{__version__}"
 
+NO_JSON_RESPONSE_CODES = [204]
 RETRYABLE_TRANSIENT_ERROR_CODES = [500, 502, 503, 504] + list(range(520, 531))
 
 __all__ = [
diff --git a/tests/unit/test_gitlab_http_methods.py b/tests/unit/test_gitlab_http_methods.py
@@ -800,6 +800,21 @@ def test_patch_request(gl):
     assert responses.assert_call_count(url, 1) is True
 
 
+@responses.activate
+def test_patch_request_204(gl):
+    url = "http://localhost/api/v4/projects"
+    responses.add(
+        method=responses.PATCH,
+        url=url,
+        status=204,
+        match=helpers.MATCH_EMPTY_QUERY_PARAMS,
+    )
+
+    result = gl.http_patch("/projects")
+    assert isinstance(result, requests.Response)
+    assert responses.assert_call_count(url, 1) is True
+
+
 @responses.activate
 def test_patch_request_404(gl):
     url = "http://localhost/api/v4/not_there"

Original file line number	Diff line number	Diff line change
`@@ -1083,6 +1083,8 @@ def http_patch(`
`1083`	`1083`	`raw=raw,`
`1084`	`1084`	`**kwargs,`
`1085`	`1085`	`)`
	`1086`	`+ if result.status_code in gitlab.const.NO_JSON_RESPONSE_CODES:`
	`1087`	`+ return result`
`1086`	`1088`	`try:`
`1087`	`1089`	`json_result = result.json()`
`1088`	`1090`	`if TYPE_CHECKING:`