try different ketchup test setup

dgbowl · Feb 27, 2024 · b9b92e2 · b9b92e2
1 parent bfc83ca
commit b9b92e2
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/tests/test_02_ketchup.py b/tests/test_02_ketchup.py
@@ -133,7 +133,10 @@ def test_ketchup_status_complete(pl, datadir, start_tomato_daemon, stop_tomato_d
 )
 def test_ketchup_cancel(pl, datadir, start_tomato_daemon, stop_tomato_daemon):
     args = [datadir, start_tomato_daemon, stop_tomato_daemon]
-    test_ketchup_status_running(pl, *args)
+    test_ketchup_submit_one(f"{pl}.yml", None, *args)
+    tomato.pipeline_load(**kwargs, pipeline="pip-counter", sampleid=pl)
+    tomato.pipeline_ready(**kwargs, pipeline="pip-counter")
+    wait_until_ketchup_status(jobid=1, status="r", port=PORT, timeout=5000)
     status = tomato.status(**kwargs, with_data=True)
     ret = ketchup.cancel(**kwargs, status=status, verbosity=0, jobids=[1])
     print(f"{ret=}")
@@ -156,7 +159,10 @@ def test_ketchup_cancel(pl, datadir, start_tomato_daemon, stop_tomato_daemon):
 )
 def test_ketchup_snapshot(pl, datadir, start_tomato_daemon, stop_tomato_daemon):
     args = [datadir, start_tomato_daemon, stop_tomato_daemon]
-    test_ketchup_status_running(pl, *args)
+    test_ketchup_submit_one(f"{pl}.yml", None, *args)
+    tomato.pipeline_load(**kwargs, pipeline="pip-counter", sampleid=pl)
+    tomato.pipeline_ready(**kwargs, pipeline="pip-counter")
+    wait_until_ketchup_status(jobid=1, status="r", port=PORT, timeout=5000)
     status = tomato.status(**kwargs, with_data=True)
     ret = ketchup.snapshot(jobids=[1], status=status)
     print(f"{ret=}")