Fix tests (str > json responses)

datarhei · Feb 27, 2023 · fdf6397 · fdf6397
1 parent 2d13271
commit fdf6397
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/core_client/base/api/v3_config_reload.py b/core_client/base/api/v3_config_reload.py
@@ -27,7 +27,13 @@ def _build_request(
 
 def _build_response(response: httpx.Response):
     if response.status_code == 200:
-        response_200 = response.text
+        if (
+            response.headers["content-type"]
+            == "application/json; charset=UTF-8"
+        ):
+            response_200 = response.json()
+        else:
+            response_200 = response.text
         return response_200
     else:
         response_error = parse_obj_as(Error, response.json())

diff --git a/core_client/base/api/v3_fs_delete_file.py b/core_client/base/api/v3_fs_delete_file.py
@@ -29,7 +29,13 @@ def _build_request(
 
 def _build_response(response: httpx.Response):
     if response.status_code == 200:
-        response_200 = response.text
+        if (
+            response.headers["content-type"]
+            == "application/json; charset=UTF-8"
+        ):
+            response_200 = response.json()
+        else:
+            response_200 = response.text
         return response_200
     else:
         response_error = parse_obj_as(Error, response.json())

diff --git a/core_client/base/api/v3_fs_put_file.py b/core_client/base/api/v3_fs_put_file.py
@@ -30,10 +30,22 @@ def _build_request(
 
 def _build_response(response: httpx.Response):
     if response.status_code == 201:
-        response_201 = response.text
+        if (
+            response.headers["content-type"]
+            == "application/json; charset=UTF-8"
+        ):
+            response_201 = response.json()
+        else:
+            response_201 = response.text
         return response_201
     elif response.status_code == 204:
-        response_204 = response.text
+        if (
+            response.headers["content-type"]
+            == "application/json; charset=UTF-8"
+        ):
+            response_204 = response.json()
+        else:
+            response_204 = response.text
         return response_204
     else:
         response_error = parse_obj_as(Error, response.json())

diff --git a/tests/4_main.py b/tests/4_main.py
@@ -302,3 +302,4 @@ def test_v3_process_put_command_start():
 def test_v3_process_delete():
     res = client.v3_process_delete(id="test")
     assert type(res) is str
+    assert res == "OK"