Commit487b9a8

committed

chore: attempt to fix flaky functional test

Add an additional check to attempt to solve the flakiness of thetest_merge_request_should_remove_source_branch() test.

1 parentd8de4dc commit487b9a8Copy full SHA for 487b9a8

File tree

-1

lines changed

-1

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -125,10 +125,18 @@ def test_merge_request_should_remove_source_branch(`
`125`	`125`	`time.sleep(0.5)`
`126`	`126`	`assertmr.merged_atisnotNone`
`127`	`127`	`time.sleep(0.5)`
	`128`	`+result=wait_for_sidekiq(timeout=60)`
	`129`	`+assertresultisTrue,"sidekiq process should have terminated but did not"`
`128`	`130`
`129`	`131`	`# Ensure we can NOT get the MR branch`
`130`	`132`	`withpytest.raises(gitlab.exceptions.GitlabGetError):`
`131`		`-project.branches.get(source_branch)`
	`133`	`+result=project.branches.get(source_branch)`
	`134`	`+# Help to debug in case the expected exception doesn't happen.`
	`135`	`+importpprint`
	`136`	`+`
	`137`	`+print("mr:",pprint.pformat(mr))`
	`138`	`+print("mr.merged_at:",pprint.pformat(mr.merged_at))`
	`139`	`+print("result:",pprint.pformat(result))`
`132`	`140`
`133`	`141`
`134`	`142`	`deftest_merge_request_large_commit_message(`

Comments

(0)