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

Shreya-7 · Shreya-7 · commit 7c46e4d86aa0 · 2022-10-31T08:32:04.000+05:30
diff --git a/tests/functional/api/test_statistics.py b/tests/functional/api/test_statistics.py
@@ -2,9 +2,14 @@
 GitLab API: https://docs.gitlab.com/ee/api/statistics.html
 """
 
+from tests.functional.conftest import reset_gitlab
+
 
 def test_get_statistics(gl):
-    gl.projects.create({"name": "projecttruffles"})
+
+    # delete resources created from other functional tests to reset application statistics
+    reset_gitlab(gl)
+
     gl.users.create(
         {
             "email": "veryuniqueemail@test.com",
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
@@ -94,7 +94,17 @@ def reset_gitlab(gl: gitlab.Gitlab) -> None:
             helpers.safe_delete(deploy_token)
         logging.info(f"Deleting project: {project.path_with_namespace!r}")
         helpers.safe_delete(project)
+
     for group in gl.groups.list():
+
+        # skip deletion of a descendant group to prevent scenarios where parent group gets deleted leaving a dangling descendant whose deletion will throw 404s.
+        # descendant groups cannot contain the `/` special character: https://docs.gitlab.com/ee/user/reserved_names.html#limitations-on-project-and-group-names
+        if "/" in group.full_path:
+            logging.info(
+                f"Skipping deletion of {group.full_path} as it is a descendant group and will be removed when the parent group is deleted"
+            )
+            continue
+
         for deploy_token in group.deploytokens.list():
             logging.info(
                 f"Deleting deploy token: {deploy_token.username!r} in "
@@ -110,7 +120,7 @@ def reset_gitlab(gl: gitlab.Gitlab) -> None:
         logging.info(f"Deleting variable: {variable.key!r}")
         helpers.safe_delete(variable)
     for user in gl.users.list():
-        if user.username != "root":
+        if user.username not in ["root", "ghost"]:
             logging.info(f"Deleting user: {user.username!r}")
             helpers.safe_delete(user, hard_delete=True)
 
