Skip to content

Commit 6525c17

Browse files
JohnVillalovosnejch
JohnVillalovos
authored and
nejch
committed
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
1 parent 9d2b1ad commit 6525c17

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

‎tests/functional/api/test_merge_requests.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ def test_merge_request_reset_approvals(gitlab_url, project, wait_for_sidekiq):
183183

184184
def test_cancel_merge_when_pipeline_succeeds(project, merge_request, wait_for_sidekiq):
185185
mr = merge_request(source_branch="test_merge_request_merge", create_pipeline=True)
186+
wait_for_sidekiq(timeout=60)
186187
# Set to merge when the pipeline succeeds, which should never happen
187188
mr.merge(merge_when_pipeline_succeeds=True)
188189
wait_for_sidekiq(timeout=60)

0 commit comments

Comments
 (0)