Nov 21, 2022 · Nov 19, 2022
diff --git a/tests/functional/api/test_merge_requests.py b/tests/functional/api/test_merge_requests.py

 def test_cancel_merge_when_pipeline_succeeds(project, merge_request, wait_for_sidekiq):
    mr = merge_request(source_branch="test_merge_request_merge", create_pipeline=True)
    wait_for_sidekiq(timeout=60)
    # Set to merge when the pipeline succeeds, which should never happen
    mr.merge(merge_when_pipeline_succeeds=True)
    wait_for_sidekiq(timeout=60)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -183,6 +183,7 @@ def test_merge_request_reset_approvals(gitlab_url, project, wait_for_sidekiq):

		def test_cancel_merge_when_pipeline_succeeds(project, merge_request, wait_for_sidekiq):
		mr = merge_request(source_branch="test_merge_request_merge", create_pipeline=True)
		wait_for_sidekiq(timeout=60)
JohnVillalovos marked this conversation as resolved. Show resolvedHide resolved
		# Set to merge when the pipeline succeeds, which should never happen
		mr.merge(merge_when_pipeline_succeeds=True)
		wait_for_sidekiq(timeout=60)
Expand Down