Commit7c46e4d

committed

Merge branch 'issue-2264-add-application-statistics' ofhttps://github.com/Shreya-7/python-gitlab into issue-2264-add-application-statistics

2 parents153e53b +08b9502 commit7c46e4dCopy full SHA for 7c46e4d

File tree

+17

-2

lines changed

+17

-2

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,14 @@`
`2`	`2`	`GitLab API: https://docs.gitlab.com/ee/api/statistics.html`
`3`	`3`	`"""`
`4`	`4`
	`5`	`+fromtests.functional.conftestimportreset_gitlab`
	`6`	`+`
`5`	`7`
`6`	`8`	`deftest_get_statistics(gl):`
`7`		`-gl.projects.create({"name":"projecttruffles"})`
	`9`	`+`
	`10`	`+# delete resources created from other functional tests to reset application statistics`
	`11`	`+reset_gitlab(gl)`
	`12`	`+`
`8`	`13`	`gl.users.create(`
`9`	`14`	`{`
`10`	`15`	`"email":"veryuniqueemail@test.com",`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,17 @@ def reset_gitlab(gl: gitlab.Gitlab) -> None:`
`94`	`94`	`helpers.safe_delete(deploy_token)`
`95`	`95`	`logging.info(f"Deleting project:{project.path_with_namespace!r}")`
`96`	`96`	`helpers.safe_delete(project)`
	`97`	`+`
`97`	`98`	`forgroupingl.groups.list():`
	`99`	`+`
	`100`	`+# skip deletion of a descendant group to prevent scenarios where parent group gets deleted leaving a dangling descendant whose deletion will throw 404s.`
	`101`	+# descendant groups cannot contain the `/` special character: https://docs.gitlab.com/ee/user/reserved_names.html#limitations-on-project-and-group-names
	`102`	`+if"/"ingroup.full_path:`
	`103`	`+logging.info(`
	`104`	`+f"Skipping deletion of{group.full_path} as it is a descendant group and will be removed when the parent group is deleted"`
	`105`	`+ )`
	`106`	`+continue`
	`107`	`+`
`98`	`108`	`fordeploy_tokeningroup.deploytokens.list():`
`99`	`109`	`logging.info(`
`100`	`110`	`f"Deleting deploy token:{deploy_token.username!r} in "`
`@@ -110,7 +120,7 @@ def reset_gitlab(gl: gitlab.Gitlab) -> None:`
`110`	`120`	`logging.info(f"Deleting variable:{variable.key!r}")`
`111`	`121`	`helpers.safe_delete(variable)`
`112`	`122`	`foruseringl.users.list():`
`113`		`-ifuser.username!="root":`
	`123`	`+ifuser.usernamenotin ["root","ghost"]:`
`114`	`124`	`logging.info(f"Deleting user:{user.username!r}")`
`115`	`125`	`helpers.safe_delete(user,hard_delete=True)`
`116`	`126`

Comments

(0)