summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tools/functional/api/test_merge_requests.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/functional/api/test_merge_requests.py b/tools/functional/api/test_merge_requests.py
index 8c2ad54..1071754 100644
--- a/tools/functional/api/test_merge_requests.py
+++ b/tools/functional/api/test_merge_requests.py
@@ -86,6 +86,7 @@ def test_merge_request_rebase(project):
assert mr.rebase()
+"""
def test_merge_request_merge(project):
mr = project.mergerequests.list()[0]
mr.merge()
@@ -94,3 +95,4 @@ def test_merge_request_merge(project):
with pytest.raises(gitlab.GitlabMRClosedError):
# Two merge attempts should raise GitlabMRClosedError
mr.merge()
+"""