fix: GL 16 does not have delayed deletion settings

TimKnight-DWP · TimKnight-DWP · commit 6c96d0f53cbd · 2024-02-12T15:24:47.000Z
- If we need to delete a project or group immediately, then should call delete action twice on the resource
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
@@ -70,17 +70,19 @@ def reset_gitlab(gl: gitlab.Gitlab) -> None:
     exist."""
     if helpers.get_gitlab_plan(gl):
         logging.info("GitLab EE detected")
-        # NOTE(jlvillal): By default in GitLab EE it will wait 7 days before
-        # deleting a group. Disable delayed group/project deletion.
+        # NOTE(jlvillal, timknight): By default in GitLab EE it will wait 7 days before
+        # deleting a group.
+        # In GL 16.0 we need to call delete twice to immediately delete rather than toggle
+        # a setting for it.
+        # https://docs.gitlab.com/ee/user/project/working_with_projects.html#delete-a-project-immediately
         settings = gl.settings.get()
         modified_settings = False
-        if settings.delayed_group_deletion:
-            logging.info("Setting `delayed_group_deletion` to False")
-            settings.delayed_group_deletion = False
-            modified_settings = True
-        if settings.delayed_project_deletion:
-            logging.info("Setting `delayed_project_deletion` to False")
-            settings.delayed_project_deletion = False
+        if settings.deletion_adjourned_period != 1:
+            logging.info("Setting `deletion_adjourned_period` to 1 Day")
+            logging.info(
+                "To perform immediate deletion in GL 16+, call delete again on the project or group"
+            )
+            settings.deletion_adjourned_period = 1
             modified_settings = True
         if modified_settings:
             settings.save()
