test: fix reset_gitlab fixture to delete descendant groups first

Shreya-7 · Shreya-7 · commit ddec1a3b3416 · 2022-10-29T17:43:34.000+05:30
diff --git a/tests/functional/api/test_statistics.py b/tests/functional/api/test_statistics.py
@@ -3,10 +3,7 @@
 """
 
 
-from tests.functional.conftest import reset_gitlab
-
-
-def test_get_statistics(gl):
+def test_get_statistics(gl, reset_gitlab):
 
     # delete resources created from other functional tests to reset application statistics
     reset_gitlab(gl)
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
@@ -94,19 +94,23 @@ 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)
-    
+
     full_paths = [group.full_path for group in gl.groups.list()]
     logging.info(f"Groups to be deleted: {full_paths}")
     for group in gl.groups.list():
         logging.info(f"Current group: {group.full_path!r}, group_id: {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)
+        descendant_full_paths = [group.full_path for group in group.descendant_groups.list(order_by="id", sort="desc")]
+        logging.info(f"Descendant groups to be deleted: {descendant_full_paths}")
+        for descendant_group in group.descendant_groups.list(order_by="id", sort="desc"):          
+            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)
     for topic in gl.topics.list():
         logging.info(f"Deleting topic: {topic.name!r}")
         helpers.safe_delete(topic)
