Commit06266ea

authored and

committed

test: tidy up functional tests

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

1 parent4bef473 commit06266eaCopy full SHA for 06266ea

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ def test_project_deploy_tokens(gl, project):`
`16`	`16`
`17`	`17`	`deploy_token=project.deploytokens.get(deploy_token.id)`
`18`	`18`	`assertdeploy_token.name=="foo"`
`19`		`-assertdeploy_token.expires_at==today+"T00:00:00.000Z"`
	`19`	`+assertdeploy_token.expires_at==f"{today}T00:00:00.000Z"`
`20`	`20`	`assertdeploy_token.scopes== ["read_registry"]`
`21`	`21`	`assertdeploy_token.username=="bar"`
`22`	`22`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,9 @@ def test_list_merge_request_commits(gitlab_cli, merge_request, project):`
`77`	`77`
`78`	`78`
`79`	`79`	`deftest_commit_merge_requests(gitlab_cli,project,merge_request):`
	`80`	+"""This tests the `project-commit merge-requests` command and also tests
	`81`	+ that we can print the result using the `json` formatter"""
	`82`	`+`
`80`	`83`	`# Pause to let GL catch up (happens on hosted too, sometimes takes a while for server to be ready to merge)`
`81`	`84`	`time.sleep(30)`
`82`	`85`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`importos`
`3`	`3`	`importtime`
`4`	`4`
`5`		`-branch="branch-cli-v4"`
	`5`	`+branch="BRANCH-cli-v4"`
`6`	`6`
`7`	`7`
`8`	`8`	`deftest_create_project(gitlab_cli):`
`@@ -243,6 +243,8 @@ 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`	`+`
`246`	`248`	`ifmr.detailed_merge_status=="not_approved":`
`247`	`249`	`approve_cmd= [`
`248`	`250`	`"project-merge-request",`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -389,9 +389,6 @@ def _make_merge_request(*, source_branch: str, create_pipeline: bool = False):`
`389`	`389`	`}`
`390`	`390`	`)`
`391`	`391`
`392`		`-# Helps with Debugging why MRs fail to merge resulting in 405 from downstream tests`
`393`		`-project.approvalrules.list()`
`394`		`-`
`395`	`392`	`ifcreate_pipeline:`
`396`	`393`	`project.files.create(`
`397`	`394`	`{`

Comments

(0)