Wait for repertory and kill daemon

Author: Roberto Sora

test/requirements.in

@@ -5,5 +5,6 @@ pyserial==3.4
 pyyaml==5.3
 prometheus-client==0.7.1
 requests==2.22.0
+pytest-timeout==1.3.4
 # temporary, replaces invoke==1.3.0 in favour of https://github.com/pyinvoke/invoke/pull/661
 git+https://github.com/flazzarini/invoke.git

test/requirements.txt

@@ -17,6 +17,7 @@ prometheus-client==0.7.1
 py==1.8.0                 # via pytest
 pyparsing==2.4.0          # via packaging
 pyserial==3.4
+pytest-timeout==1.3.4
 pytest==5.3.4
 pyyaml==5.3
 requests==2.22.0

test/test_daemon.py

@@ -16,26 +16,28 @@
 import os
 import subprocess
 import time
-
+import pytest
 import requests
 import yaml
 from prometheus_client.parser import text_string_to_metric_families
 
-
+@pytest.mark.timeout(30)
 def test_telemetry_prometheus_endpoint(pytestconfig, data_dir, downloads_dir):
-    # Init the environment explicitly
+
+    # Use raw subprocess here due to a missing functionality in pinned pyinvoke ver,
+    # in order to launch and detach the cli process in daemon mode
     cli_path = os.path.join(str(pytestconfig.rootdir), "..", "arduino-cli")
     env = os.environ.copy()
     env["ARDUINO_DATA_DIR"] = data_dir
     env["ARDUINO_DOWNLOADS_DIR"] = downloads_dir
     env["ARDUINO_SKETCHBOOK_DIR"] = data_dir
+    daemon = subprocess.Popen([cli_path, "daemon"], env=env)
 
-    subprocess.Popen([cli_path, "daemon"], env=env)
-
-    time.sleep(5)
 
-    # parse repertory file
+    # wait for and then parse repertory file
     repertory_file = os.path.join(data_dir, "repertory.yaml")
+    while not os.path.exists(repertory_file):
+        time.sleep(1)
     with open(repertory_file, 'r') as stream:
         repertory = yaml.safe_load(stream)
 
@@ -45,3 +47,5 @@ def test_telemetry_prometheus_endpoint(pytestconfig, data_dir, downloads_dir):
         family = next(text_string_to_metric_families(metrics))
         sample = family.samples[0]
         assert repertory["installation"]["id"] == sample.labels["installationID"]
+    #add a fixture here!
+    daemon.kill()