Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mwdd146980 merged 2 commits into from
Apr 24, 2026
+2 −4
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85876eb
Fix gitlab conftest: json.loads for version response, remove dead /-/…
mwdd146980 Apr 23, 2026
8f4832a
Drop test_version_mock_returns_parsed_dict: fix self-evident, test wo…
mwdd146980 Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions gitlab/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]))
Expand Down
Loading