Commit48a6705

authored and

committed

test: remove approve step

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

1 parent2d1f487 commit48a6705Copy full SHA for 48a6705

File tree

-16

lines changed

-16

lines changed

Lines changed: 0 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -243,22 +243,6 @@ def test_accept_request_merge(gitlab_cli, project):`
`243`	`243`	`# Pause to let GL catch up (happens on hosted too, sometimes takes a while for server to be ready to merge)`
`244`	`244`	`time.sleep(30)`
`245`	`245`
`246`		`-mr=project.mergerequests.get(mr.iid)`
`247`		`-`
`248`		`-ifmr.detailed_merge_status=="not_approved":`
`249`		`-approve_cmd= [`
`250`		`-"project-merge-request",`
`251`		`-"approve",`
`252`		`-"--project-id",`
`253`		`-project.id,`
`254`		`-"--iid",`
`255`		`-mr.iid,`
`256`		`- ]`
`257`		`-gitlab_cli(approve_cmd)`
`258`		`-`
`259`		`-# Pause to let GL catch up (happens on hosted too, sometimes takes a while for server to be ready to merge)`
`260`		`-time.sleep(5)`
`261`		`-`
`262`	`246`	`approve_cmd= [`
`263`	`247`	`"project-merge-request",`
`264`	`248`	`"merge",`

Comments

(0)