fix: develop a more flexible solution for sidekiq helper

TimKnight-DWP · TimKnight-DWP · commit 6c9504556a2c · 2024-02-08T16:31:39.000Z
Signed-off-by: Tim Knight &lt;tim.knight1@engineering.digital.dwp.gov.uk&gt;
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
@@ -211,20 +211,24 @@ def _check(
 @pytest.fixture
 def wait_for_sidekiq(gl):
     """
-    Return a helper function to wait until there are no busy sidekiq processes.
+    Return a helper function to wait until there are spare sidekiq processes.
+
+    Because not all Groups can be deleted immediately in GL 16, we will likely have busy Sidekiq jobs
+    set aside for their deletion in 1 days time.
 
     Use this with asserts for slow tasks (group/project/user creation/deletion).
     """
 
     def _wait(timeout: int = 30, step: float = 0.5, allow_fail: bool = False) -> bool:
         for count in range(timeout):
             time.sleep(step)
-            busy = False
             processes = gl.sidekiq.process_metrics()["processes"]
+            busy_processes = []
             for process in processes:
                 if process["busy"]:
-                    busy = True
-            if not busy:
+                    busy_processes.append(process)
+            #  If we have at least one spare process, continue
+            if not (len(busy_processes) + 1) >= len(processes):
                 return True
             logging.info(f"sidekiq busy {count} of {timeout}")
         assert allow_fail, "sidekiq process should have terminated but did not."
