More reliable state tests.

src/tomato/daemon/__init__.py

@@ -4,6 +4,7 @@
 .. codeauthor::
     Peter Kraus
 """
+
 import logging
 import argparse
 from threading import Thread

src/tomato/ketchup/__init__.py

@@ -14,6 +14,7 @@
 - :func:`search` to find a ``jobid`` of a *job* from ``jobname``
 
 """
+
 import json
 import logging
 from pathlib import Path

src/tomato/tomato/__init__.py

@@ -19,6 +19,7 @@
 - :func:`pipeline_ready` to mark a pipeline as ready
 
 """
+
 import os
 import subprocess
 import textwrap

tests/test_03_state.py

@@ -4,20 +4,24 @@
 import time
 
 from tomato import ketchup, tomato
+from .utils import wait_until_tomato_running, wait_until_ketchup_status
 
 PORT = 12345
 CTXT = zmq.Context()
+WAIT = 5000
 
 kwargs = dict(port=PORT, timeout=1000, context=CTXT)
 
 
 def test_recover_queued_jobs(datadir, start_tomato_daemon, stop_tomato_daemon):
+    assert wait_until_tomato_running(port=PORT, timeout=WAIT)
     os.chdir(datadir)
     ketchup.submit(payload="dummy_random_5_2.yml", jobname="job-1", **kwargs)
     ketchup.submit(payload="dummy_random_5_2.yml", jobname="job-2", **kwargs)
     tomato.stop(**kwargs)
     assert os.path.exists("tomato_state_12345.pkl")
     tomato.start(**kwargs, appdir=Path(), logdir=Path(), verbosity=0)
+    assert wait_until_tomato_running(port=PORT, timeout=WAIT)
     ret = tomato.status(**kwargs, with_data=True)
     print(f"{ret=}")
     assert ret.success
@@ -26,14 +30,16 @@ def test_recover_queued_jobs(datadir, start_tomato_daemon, stop_tomato_daemon):
 
 
 def test_recover_running_jobs(datadir, start_tomato_daemon, stop_tomato_daemon):
+    assert wait_until_tomato_running(port=PORT, timeout=WAIT)
     os.chdir(datadir)
     ketchup.submit(payload="dummy_random_5_2.yml", jobname="job-1", **kwargs)
     tomato.pipeline_load(**kwargs, pipeline="dummy-5", sampleid="dummy_random_5_2")
     tomato.pipeline_ready(**kwargs, pipeline="dummy-5")
-    time.sleep(2)
+    wait_until_ketchup_status(jobid=1, status="r", port=PORT, timeout=WAIT)
     tomato.stop(**kwargs)
     assert os.path.exists("tomato_state_12345.pkl")
     tomato.start(**kwargs, appdir=Path(), logdir=Path(), verbosity=0)
+    assert wait_until_tomato_running(port=PORT, timeout=WAIT)
     ret = tomato.status(**kwargs, with_data=True)
     print(f"{ret=}")
     assert ret.success
@@ -43,16 +49,17 @@ def test_recover_running_jobs(datadir, start_tomato_daemon, stop_tomato_daemon):
 
 
 def test_recover_waiting_jobs(datadir, start_tomato_daemon, stop_tomato_daemon):
+    assert wait_until_tomato_running(port=PORT, timeout=WAIT)
     os.chdir(datadir)
     ketchup.submit(payload="dummy_random_5_2.yml", jobname="job-1", **kwargs)
     tomato.pipeline_load(**kwargs, pipeline="dummy-5", sampleid="dummy_random_5_2")
     tomato.pipeline_ready(**kwargs, pipeline="dummy-5")
-    time.sleep(2)
+    wait_until_ketchup_status(jobid=1, status="r", port=PORT, timeout=WAIT)
     tomato.stop(**kwargs)
     assert os.path.exists("tomato_state_12345.pkl")
-    time.sleep(5)
     tomato.start(**kwargs, appdir=Path(), logdir=Path(), verbosity=0)
-    time.sleep(2)
+    assert wait_until_tomato_running(port=PORT, timeout=WAIT)
+    wait_until_ketchup_status(jobid=1, status="c", port=PORT, timeout=10000)
     ret = tomato.status(**kwargs, with_data=True)
     print(f"{ret=}")
     assert ret.success