test(api): fix flaky test `test_cancel_merge_when_pipeline_succeeds` · python-gitlab/python-gitlab@6525c17 · GitHub

1. python-gitlab
2. python-gitlab

Repository navigation

• Code
• Issues16 (16)
• Pull requests15 (15)
• Discussions
• Actions
• Projects
• Security and quality
• Insights

Commit 6525c17

Browse filesBrowse the repository at this point in the historyBrowse files

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
Copy full SHA for 6525c17

1 file changed

+1Lines changed: 1 addition & 0 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• tests/functional/api
  • test_merge_requests.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎tests/functional/api/test_merge_requests.py‎

Copy file name to clipboardExpand all lines: tests/functional/api/test_merge_requests.py

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -183,6 +183,7 @@ def test_merge_request_reset_approvals(gitlab_url, project, wait_for_sidekiq):
183	183
184	184	def test_cancel_merge_when_pipeline_succeeds(project, merge_request, wait_for_sidekiq):
185	185	mr = merge_request(source_branch="test_merge_request_merge", create_pipeline=True)
	186	+ wait_for_sidekiq(timeout=60)
186	187	# Set to merge when the pipeline succeeds, which should never happen
187	188	mr.merge(merge_when_pipeline_succeeds=True)
188	189	wait_for_sidekiq(timeout=60)

0 commit comments

Comments

0 (0)