fix: logic for sidekiq

TimKnight-DWP · TimKnight-DWP · commit db2554780d3a · 2024-02-08T16:55:34.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,16 +223,16 @@ 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 = []
+            busy_processes = 0
+            total_concurrency = 0
             for process in processes:
-                if process["busy"]:
-                    busy_processes.append("True")
+                logging.info(f"Process {processes}")
+                busy_processes += process["busy"]
+                total_concurrency += process["concurrency"]
 
-            logging.info(f"Busy process {len(busy_processes)}")
-
-            #  If we have at least one spare process, continue
-            if len(busy_processes) <= len(processes):
+            logging.info(f"Busy processes {busy_processes}")
+            #  If we have space concurrency in the process, continue
+            if busy_processes < total_concurrency:
                 logging.info("Spare sidekiq process found")
                 return True
 
