test: revert "run loop for top level groups only in reset_gitlab"

Shreya-7 · Shreya-7 · commit f3a8fcc6a1af · 2022-10-31T23:13:39.000+05:30
This reverts commit 5343394.
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
@@ -95,8 +95,15 @@ def reset_gitlab(gl: gitlab.Gitlab) -> None:
         logging.info(f"Deleting project: {project.path_with_namespace!r}")
         helpers.safe_delete(project)
 
-    # skip deletion of a descendant group to prevent scenarios where parent group gets deleted leaving a dangling descendant whose deletion will throw 404s.
-    for group in gl.groups.list(top_level_only=True):
+    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.
+        if group.parent_id:
+            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 "
