From 7e5fef9871fc32b76d264933d906f8edf45b855f Mon Sep 17 00:00:00 2001
From: mwdd146980 <96082814+mwdd146980@users.noreply.github.com>
Date: Fri, 24 Apr 2026 04:18:22 -0400
Subject: [PATCH] Fix gitlab conftest: json.loads for version response, remove
 dead /-/health branch (#23452)

* Fix gitlab conftest: json.loads for version response, remove dead /-/health branch

* Drop test_version_mock_returns_parsed_dict: fix self-evident, test would need updates at httpx migration
---
 gitlab/tests/conftest.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gitlab/tests/conftest.py b/gitlab/tests/conftest.py
index b0d47e010b803..b7d24e38eadae 100644
--- a/gitlab/tests/conftest.py
+++ b/gitlab/tests/conftest.py
@@ -148,15 +148,13 @@ def mocked_requests_get(*args, **kwargs):
                 iter_lines=lambda **kwargs: text_data.split("\n"),
                 headers={'Content-Type': "text/plain"},
             )
-    elif url == "http://{}:{}/api/v4/version".format(HOST, GITLAB_LOCAL_PORT) or url == "http://{}:{}/-/health".format(
-        HOST, GITLAB_LOCAL_PORT
-    ):
+    elif url == "http://{}:{}/api/v4/version".format(HOST, GITLAB_LOCAL_PORT):
         f_name = os.path.join(os.path.dirname(__file__), 'fixtures', 'version.json')
         with open(f_name, 'r') as f:
             text_data = f.read()
             response = mock.MagicMock()
             response.status_code = 200
-            response.json.return_value = text_data
+            response.json.return_value = json.loads(text_data)
             return response
 
     pytest.fail("url `{}` not registered".format(args[0]))