Commitce1ae1f

committed

chore: debug test fails

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

1 parentc26bd29 commitce1ae1fCopy full SHA for ce1ae1f

File tree

+17

-4

lines changed

+17

-4

lines changed

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
	`1`	`+importlogging`
`1`	`2`	`importtime`
`2`		`-fromdatetimeimportdate`
	`3`	`+fromdatetimeimportdate,timedelta`
`3`	`4`
`4`	`5`	`importpytest`
`5`	`6`
`@@ -170,15 +171,24 @@ def test_project_merge_request_approval_rules(group, project):`
`170`	`171`
`171`	`172`
`172`	`173`	`deftest_merge_request_reset_approvals(gitlab_url,project):`
	`174`	`+today=date.today()`
	`175`	`+future_date=today+timedelta(days=4)`
`173`	`176`	`bot=project.access_tokens.create(`
`174`		`- {"name":"bot","scopes": ["api"],"expires_at":date.today().isoformat()}`
	`177`	`+ {"name":"bot","scopes": ["api"],"expires_at":future_date.isoformat()}`
`175`	`178`	`)`
	`179`	`+logging.info("Created token for Bot")`
	`180`	`+`
`176`	`181`	`bot_gitlab=gitlab.Gitlab(gitlab_url,private_token=bot.token)`
	`182`	`+logging.info("Created bot")`
`177`	`183`	`bot_project=bot_gitlab.projects.get(project.id,lazy=True)`
`178`	`184`
	`185`	`+logging.info(f"Retrieved project for bot:{bot_project.id}")`
`179`	`186`	`# Pause to let GL catch up (happens on hosted too, sometimes takes a while for server to be ready to merge)`
`180`	`187`	`time.sleep(5)`
	`188`	`+`
`181`	`189`	`mr=bot_project.mergerequests.list()[0]# type: ignore[index]`
	`190`	`+`
	`191`	`+logging.info("Resetting approvals on MR")`
`182`	`192`	`assertmr.reset_approvals()`
`183`	`193`
`184`	`194`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+importlogging`
`1`	`2`	`importuuid`
`2`	`3`
`3`	`4`	`importpytest`
`@@ -265,6 +266,7 @@ def test_project_protected_branches(project, wait_for_sidekiq, gitlab_version):`
`265`	`266`	`gitlab_version.major==15andgitlab_version.minor>=6`
`266`	`267`	`)`
`267`	`268`
	`269`	`+logging.info("Creating protected branch")`
`268`	`270`	`p_b=project.protectedbranches.create(`
`269`	`271`	`{`
`270`	`272`	`"name":"*-stable",`
`@@ -281,6 +283,7 @@ def test_project_protected_branches(project, wait_for_sidekiq, gitlab_version):`
`281`	`283`	`wait_for_sidekiq(timeout=60)`
`282`	`284`
`283`	`285`	`p_b=project.protectedbranches.get("*-stable")`
	`286`	`+logging.info("Deleted protected branch")`
`284`	`287`	`ifcan_update_prot_branch:`
`285`	`288`	`assertp_b.allow_force_push`
`286`	`289`	`p_b.delete()`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,9 @@ def test_delete_user(gl):`
`73`	`73`	`}`
`74`	`74`	`)`
`75`	`75`
`76`		`-new_user.delete()`
	`76`	`+new_user.delete(hard_delete=True)`
`77`	`77`	`# Pause to let GL catch up (happens on hosted too, sometimes takes a while for server to be ready to merge)`
`78`		`-time.sleep(5)`
	`78`	`+time.sleep(30)`
`79`	`79`
`80`	`80`	`assertnew_user.idnotin [user.idforuseringl.users.list()]`
`81`	`81`

Comments

(0)