test: fix descendant group deletion

Shreya-7 · Shreya-7 · commit 40aa5bde431f · 2022-10-29T19:26:40.000+05:30
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
@@ -110,14 +110,16 @@ def reset_gitlab(gl: gitlab.Gitlab) -> None:
             logging.info(
                 f"Current group: {descendant_group.full_path!r}, group_id: {descendant_group.get_id()}"
             )
-            for deploy_token in group.deploytokens.list():
-                logging.info(
-                    f"Deleting deploy token: {deploy_token.username!r} in "
-                    f"group: {group.path_with_namespace!r}"
-                )
-                helpers.safe_delete(deploy_token)
-            logging.info(f"Deleting group: {group.full_path!r}")
-            helpers.safe_delete(group)
+            logging.info(f"Deleting descendant group: {descendant_group.full_path!r}")
+            helpers.safe_delete(descendant_group)
+        for deploy_token in group.deploytokens.list():
+            logging.info(
+                f"Deleting deploy token: {deploy_token.username!r} in "
+                f"group: {group.path_with_namespace!r}"
+            )
+            helpers.safe_delete(deploy_token)
+        logging.info(f"Deleting group: {group.full_path!r}")
+        helpers.safe_delete(group)
     for topic in gl.topics.list():
         logging.info(f"Deleting topic: {topic.name!r}")
         helpers.safe_delete(topic)
