Taught monitor_task_group fixture to respond better to fatal errors.

fixes pulp#3923.
ggainey · Jul 11, 2023 · d517e67 · d517e67
1 parent ee78e0c
commit d517e67
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/CHANGES/3923.misc b/CHANGES/3923.misc
@@ -0,0 +1 @@
+Fixed possible infinite-wait in monitor_task_group fixture.
diff --git a/pulpcore/tests/functional/__init__.py b/pulpcore/tests/functional/__init__.py
@@ -812,9 +812,18 @@ def _monitor_task(task_href):
 @pytest.fixture(scope="session")
 def monitor_task_group(task_groups_api_client):
     def _monitor_task_group(task_group_href):
+        def tasks_open(tg):
+            return (tg.waiting + tg.running) > 0
+
+        def group_wait(tg):
+            return not tg.all_tasks_dispatched or tasks_open(tg)
+
+        def group_fail(tg):
+            return tg.failed > 0 and not tasks_open(tg)
+
         task_group = task_groups_api_client.read(task_group_href)
 
-        while not task_group.all_tasks_dispatched or (task_group.waiting + task_group.running) > 0:
+        while group_wait(task_group) and not group_fail(task_group):
             sleep(SLEEP_TIME)
             task_group = task_groups_api_client.read(task_group_href)