diff --git a/tests/functional/api/test_merge_requests.py b/tests/functional/api/test_merge_requests.py index 56ee7bc42..cf975af59 100644 --- a/tests/functional/api/test_merge_requests.py +++ b/tests/functional/api/test_merge_requests.py @@ -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) # Set to merge when the pipeline succeeds, which should never happen mr.merge(merge_when_pipeline_succeeds=True) wait_for_sidekiq(timeout=60)
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies: