Commitfdd4114

authored and

committed

chore: fix flaky test

1 parent9b88132 commitfdd4114Copy full SHA for fdd4114

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -127,11 +127,10 @@ def test_merge_request_reset_approvals(gitlab_url, project, wait_for_sidekiq):`
`127`	`127`	`assertmr.reset_approvals()`
`128`	`128`
`129`	`129`
`130`		`-@pytest.mark.skip(reason="flaky test")`
`131`		`-deftest_merge_request_merge(project):`
`132`		`-mr=project.mergerequests.list()[0]`
	`130`	`+deftest_merge_request_merge(project,merge_request,wait_for_sidekiq):`
	`131`	`+mr=merge_request(source_branch="test_merge_request_merge")`
`133`	`132`	`mr.merge()`
`134`		`-project.branches.delete(mr.source_branch)`
	`133`	`+wait_for_sidekiq(timeout=60)`
`135`	`134`
`136`	`135`	`withpytest.raises(gitlab.GitlabMRClosedError):`
`137`	`136`	`# Two merge attempts should raise GitlabMRClosedError`

Comments

(0)