Skip to content
Snippets Groups Projects

Bump Python requirement python-gitlab to 3.9.0

Merged Teklia Bot requested to merge bump-python-gitlab into master
2 files
+ 8
5
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 7
4
@@ -4,6 +4,7 @@ from pathlib import Path
import pytest
from gitlab import GitlabCreateError, GitlabError
from requests import ConnectionError
from responses import matchers
from arkindex_worker.git import GitlabHelper
@@ -216,12 +217,13 @@ def test_merge_request(fake_responses, fake_gitlab_helper_factory, mocker):
fake_responses.add(
fake_responses.PUT,
f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge?should_remove_source_branch=True",
f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge",
json={
"iid": MERGE_REQUEST_ID,
"state": "merged",
# several fields omitted
},
match=[matchers.json_params_matcher({"should_remove_source_branch": True})],
)
# the fake_responses are defined in the same order as they are expected to be called
@@ -233,7 +235,6 @@ def test_merge_request(fake_responses, fake_gitlab_helper_factory, mocker):
gitlab_helper._wait_for_rebase_to_finish.return_value = True
success = gitlab_helper.merge(SOURCE_BRANCH, MR_TITLE)
assert success
assert len(fake_responses.calls) == 4
assert [c.request.method for c in fake_responses.calls] == expected_http_methods
@@ -255,9 +256,10 @@ def test_merge_request_fail(fake_responses, fake_gitlab_helper_factory, mocker):
fake_responses.add(
fake_responses.PUT,
f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge?should_remove_source_branch=True",
f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge",
json={"error": "Method not allowed"},
status=405,
match=[matchers.json_params_matcher({"should_remove_source_branch": True})],
)
# the fake_responses are defined in the same order as they are expected to be called
@@ -340,12 +342,13 @@ def test_merge_request__success_after_errors(
fake_responses.add(
fake_responses.PUT,
f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge?should_remove_source_branch=True",
f"https://gitlab.com/api/v4/projects/{PROJECT_ID}/merge_requests/{MERGE_REQUEST_ID}/merge",
json={
"iid": MERGE_REQUEST_ID,
"state": "merged",
# several fields omitted
},
match=[matchers.json_params_matcher({"should_remove_source_branch": True})],
)
# the fake_responses are defined in the same order as they are expected to be called
Loading