Tests: Improve the timing of bootstrapping the machinery

daq-tools · Nov 28, 2021 · 7a4dc1a · 7a4dc1a
1 parent 0414e02
commit 7a4dc1a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/test/conftest.py b/test/conftest.py
@@ -7,12 +7,15 @@
 import pytest
 import logging
 
+import pytest_twisted
+
 from kotori import KotoriBootloader
-from test.util import boot_kotori
+from test.util import boot_kotori, sleep
 from test.settings.mqttkit import influx_sensors, influx_events, grafana
 
 logger = logging.getLogger(__name__)
 
+STARTUP_DELAY = 1.5
 
 # Disable ellipsis truncation
 # https://stackoverflow.com/questions/19171554/preventing-truncation-of-long-strings-in-pytest/60321834#60321834
@@ -23,7 +26,7 @@
 
 def create_machinery(config, scope="package"):
 
-    #@pytest_twisted.inlineCallbacks
+    @pytest_twisted.inlineCallbacks
     @pytest.fixture(scope=scope)
     def machinery():
 
@@ -34,9 +37,11 @@ def machinery():
         result = boot_kotori(config)
         assert isinstance(result, KotoriBootloader)
 
-        #pytest_twisted.blockon(result)
+        logger.info(f"Delaying for {STARTUP_DELAY} seconds to wait for the machinery to start")
+        waiter = sleep(STARTUP_DELAY)
+        pytest_twisted.blockon(waiter)
 
-        logger.info('Machinery is almost ready')
+        logger.info('Machinery is ready')
         yield result
 
     return machinery

diff --git a/test/test_airrohr.py b/test/test_airrohr.py
@@ -81,11 +81,6 @@ def test_airrohr_http_json(machinery_basic, create_influxdb, reset_influxdb):
     and proof it is stored in the InfluxDB database.
     """
 
-    # Wait for some time to let the machinery spin up.
-    yield sleep(PROCESS_DELAY_MQTT)
-    yield sleep(PROCESS_DELAY_MQTT)
-    yield sleep(PROCESS_DELAY_MQTT)
-
     # Submit a single measurement, without timestamp.
     yield threads.deferToThread(http_json_sensor, settings.channel_path_airrohr, data_in)
 

diff --git a/test/test_basic.py b/test/test_basic.py
@@ -20,11 +20,6 @@ def test_mqtt_strategy_lan(machinery_basic, create_influxdb, reset_influxdb, res
     that a corresponding datasource and a dashboard was created in Grafana.
     """
 
-    # Wait for some time to spin up the machinery.
-    yield sleep(PROCESS_DELAY_MQTT)
-    yield sleep(PROCESS_DELAY_MQTT)
-    yield sleep(PROCESS_DELAY_MQTT)
-
     # Submit a single measurement, without timestamp.
     data = {
         'temperature': 42.84,