same in state tests

Author: PeterKraus

tests/test_03_state.py

@@ -17,8 +17,12 @@
 
 def test_stop_with_queued_jobs(datadir, start_tomato_daemon, stop_tomato_daemon):
     os.chdir(datadir)
-    ketchup.submit(payload="counter_1_0.1.yml", jobname="job-1", **kwargs)
-    ketchup.submit(payload="counter_5_0.2.yml", jobname="job-2", **kwargs)
+    ret = tomato.status(**kwargs)
+    assert ret.success
+    daemon = ret.data
+
+    ketchup.submit(payload="counter_1_0.1.yml", jobname="job-1", **kwargs, daemon=daemon)
+    ketchup.submit(payload="counter_5_0.2.yml", jobname="job-2", **kwargs, daemon=daemon)
 
     time.sleep(1)
     tomato.stop(**kwargs)
@@ -35,7 +39,11 @@ def test_stop_with_queued_jobs(datadir, start_tomato_daemon, stop_tomato_daemon)
 
 def test_stop_with_running_jobs(datadir, start_tomato_daemon, stop_tomato_daemon):
     os.chdir(datadir)
-    ketchup.submit(payload="counter_5_0.2.yml", jobname="job-1", **kwargs)
+    ret = tomato.status(**kwargs)
+    assert ret.success
+    daemon = ret.data
+
+    ketchup.submit(payload="counter_5_0.2.yml", jobname="job-1", **kwargs, daemon=daemon)
     tomato.pipeline_load(**kwargs, pipeline="pip-counter", sampleid="counter_5_0.2")
     tomato.pipeline_ready(**kwargs, pipeline="pip-counter")
     assert utils.wait_until_ketchup_status(1, "r", PORT, WAIT)
@@ -48,7 +56,11 @@ def test_stop_with_running_jobs(datadir, start_tomato_daemon, stop_tomato_daemon
 
 def test_restart_with_running_jobs(datadir, start_tomato_daemon, stop_tomato_daemon):
     os.chdir(datadir)
-    ketchup.submit(payload="counter_20_5.yml", jobname="job-1", **kwargs)
+    ret = tomato.status(**kwargs)
+    assert ret.success
+    daemon = ret.data
+
+    ketchup.submit(payload="counter_20_5.yml", jobname="job-1", **kwargs, daemon=daemon)
     tomato.pipeline_load(**kwargs, pipeline="pip-counter", sampleid="counter_20_5")
     tomato.pipeline_ready(**kwargs, pipeline="pip-counter")
     assert utils.wait_until_ketchup_status(1, "r", PORT, WAIT)
@@ -76,7 +88,11 @@ def test_restart_with_running_jobs(datadir, start_tomato_daemon, stop_tomato_dae
 
 def test_restart_with_complete_jobs(datadir, start_tomato_daemon, stop_tomato_daemon):
     os.chdir(datadir)
-    ketchup.submit(payload="counter_5_0.2.yml", jobname="job-1", **kwargs)
+    ret = tomato.status(**kwargs)
+    assert ret.success
+    daemon = ret.data
+
+    ketchup.submit(payload="counter_5_0.2.yml", jobname="job-1", **kwargs, daemon=daemon)
     tomato.pipeline_load(**kwargs, pipeline="pip-counter", sampleid="counter_5_0.2")
     tomato.pipeline_ready(**kwargs, pipeline="pip-counter")
     assert utils.wait_until_ketchup_status(1, "r", PORT, timeout=WAIT)
@@ -98,7 +114,11 @@ def test_restart_with_complete_jobs(datadir, start_tomato_daemon, stop_tomato_da
 
 def test_restart_with_crashed_jobs(datadir, start_tomato_daemon, stop_tomato_daemon):
     os.chdir(datadir)
-    ketchup.submit(payload="counter_20_5.yml", jobname="job-1", **kwargs)
+    ret = tomato.status(**kwargs)
+    assert ret.success
+    daemon = ret.data
+
+    ketchup.submit(payload="counter_20_5.yml", jobname="job-1", **kwargs, daemon=daemon)
     tomato.pipeline_load(**kwargs, pipeline="pip-counter", sampleid="counter_20_5")
     tomato.pipeline_ready(**kwargs, pipeline="pip-counter")
     assert utils.wait_until_ketchup_status(1, "r", PORT, WAIT)
@@ -146,7 +166,11 @@ def test_crashed_driver_restarts(datadir, start_tomato_daemon, stop_tomato_daemo
 
 def test_crashed_driver_with_jobs(datadir, start_tomato_daemon, stop_tomato_daemon):
     os.chdir(datadir)
-    ketchup.submit(payload="counter_5_0.2.yml", jobname="job-1", **kwargs)
+    ret = tomato.status(**kwargs)
+    assert ret.success
+    daemon = ret.data
+
+    ketchup.submit(payload="counter_5_0.2.yml", jobname="job-1", **kwargs, daemon=daemon)
     tomato.pipeline_load(**kwargs, pipeline="pip-counter", sampleid="counter_5_0.2")
     tomato.pipeline_ready(**kwargs, pipeline="pip-counter")
     assert utils.wait_until_ketchup_status(1, "r", PORT, WAIT)