From 0eb336b4fe5c86a791728cc456ffc55e44a4e6bb Mon Sep 17 00:00:00 2001 From: "John L. Villalovos" Date: Sat, 19 Nov 2022 10:40:03 -0800 Subject: [PATCH] test(api): fix flaky test `test_cancel_merge_when_pipeline_succeeds` This is an attempt to fix the flaky test `test_cancel_merge_when_pipeline_succeeds`. Were seeing a: 405 Method Not Allowed error when setting the MR to merge_when_pipeline_succeeds. Closes: #2383 --- tests/functional/api/test_merge_requests.py | 1 + 1 file changed, 1 insertion(+) 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)