Commit2f67725

committed

fix: use detailed_merge_status to check state in conftest.py

Signed-off-by: Tim Knight <tim.knight1@engineering.digital.dwp.gov.uk>

1 parent117b961 commit2f67725Copy full SHA for 2f67725

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -459,10 +459,14 @@ def _make_merge_request(*, source_branch: str, create_pipeline: bool = False):`
`459`	`459`	`mr_iid=mr.iid`
`460`	`460`	`for_inrange(60):`
`461`	`461`	`mr=project.mergerequests.get(mr_iid)`
`462`		`-ifmr.merge_status!="checking":`
	`462`	`+if (`
	`463`	`+mr.detailed_merge_status!="checking"`
	`464`	`+andmr.detailed_merge_status!="unchecked"`
	`465`	`+ ):`
`463`	`466`	`break`
`464`	`467`	`time.sleep(0.5)`
`465`	`468`	`assertmr.merge_status!="checking"`
	`469`	`+assertmr.merge_status!="unchecked"`
`466`	`470`
`467`	`471`	`to_delete.extend([mr,mr_branch])`
`468`	`472`	`returnmr`

Comments

(0)