fix: logic for sidekiq

TimKnight-DWP · TimKnight-DWP · commit 19c50fe00cae · 2024-02-08T16:44:17.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
@@ -223,14 +223,19 @@ def _wait(timeout: int = 30, step: float = 0.5, allow_fail: bool = False) -> boo
         for count in range(timeout):
             time.sleep(step)
             processes = gl.sidekiq.process_metrics()["processes"]
+            logging.info(f"Total processes {len(processes)}")
             busy_processes = []
             for process in processes:
                 if process["busy"]:
                     busy_processes.append("True")
+
+            logging.info(f"Busy process {len(busy_processes)}")
+
             #  If we have at least one spare process, continue
-            if not (len(busy_processes) + 1) >= len(processes):
+            if len(busy_processes) <= len(processes):
                 logging.info("Spare sidekiq process found")
                 return True
+
             logging.info(f"sidekiq busy {count} of {timeout}")
         assert allow_fail, "sidekiq process should have terminated but did not."
         return False
