diff options
| author | John L. Villalovos <john@sodarock.com> | 2022-11-19 10:40:03 -0800 |
|---|---|---|
| committer | Nejc Habjan <hab.nejc@gmail.com> | 2022-11-21 23:27:22 +0100 |
| commit | 6525c17b8865ead650a6e09f9bf625ca9881911b (patch) | |
| tree | 84984c99a956a8913ddc3bccba627c3355765afd | |
| parent | 9d2b1ad10aaa78a5c28ece334293641c606291b5 (diff) | |
| download | gitlab-6525c17b8865ead650a6e09f9bf625ca9881911b.tar.gz | |
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
| -rw-r--r-- | tests/functional/api/test_merge_requests.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/functional/api/test_merge_requests.py b/tests/functional/api/test_merge_requests.py index 56ee7bc..cf975af 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) |