Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0eb336b

Browse files
test(api): fix flaky testtest_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 tomerge_when_pipeline_succeeds.Closes:#2383
1 parent9d2b1ad commit0eb336b

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

‎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
deftest_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)
[8]ページ先頭
©2009-2025 Movatter.jp