updates

Author: hrfarmer

FprimeZephyrReference/test/int/conftest.py

@@ -0,0 +1,33 @@
+import os
+import signal
+import subprocess
+import time
+
+import pytest
+from fprime_gds.common.testing_fw.api import IntegrationTestAPI
+
+
+@pytest.fixture(scope="session")
+def start_gds(fprime_test_api_session: IntegrationTestAPI):
+    pro = subprocess.Popen(
+        ["make", "gds-integration"],
+        cwd=os.getcwd(),
+        stdout=subprocess.PIPE,
+        preexec_fn=os.setsid,
+    )
+
+    gds_working = False
+    timeout_time = time.time() + 30
+    while time.time() < timeout_time:
+        try:
+            fprime_test_api_session.send_and_assert_command(
+                command="CdhCore.cmdDisp.CMD_NO_OP"
+            )
+            gds_working = True
+            break
+        except Exception:
+            time.sleep(1)
+    assert gds_working
+
+    yield
+    os.killpg(os.getpgid(pro.pid), signal.SIGTERM)

FprimeZephyrReference/test/int/imu_manager_test.py

@@ -4,36 +4,11 @@
 Integration tests for the IMU Manager component.
 """
 
-import os
-import subprocess
-import time
-
 import pytest
 from fprime_gds.common.data_types.ch_data import ChData
 from fprime_gds.common.testing_fw.api import IntegrationTestAPI
 
 
-@pytest.fixture(scope="session", autouse=True)
-def start_gds(fprime_test_api_session: IntegrationTestAPI):
-    process = subprocess.Popen(["make", "gds-integration"], cwd=os.getcwd())
-
-    gds_working = False
-    timeout_time = time.time() + 30
-    while time.time() < timeout_time:
-        try:
-            fprime_test_api_session.send_and_assert_command(
-                command="CdhCore.cmdDisp.CMD_NO_OP"
-            )
-            gds_working = True
-            break
-        except Exception:
-            time.sleep(1)
-    assert gds_working
-
-    yield
-    process.kill()
-
-
 @pytest.fixture(autouse=True)
 def send_packet(fprime_test_api: IntegrationTestAPI):
     """Fixture to clear histories and send the IMU packet before each test"""
@@ -43,7 +18,7 @@ def send_packet(fprime_test_api: IntegrationTestAPI):
     )
 
 
-def test_01_acceleration_telemetry(fprime_test_api: IntegrationTestAPI):
+def test_01_acceleration_telemetry(fprime_test_api: IntegrationTestAPI, start_gds):
     """Test that we can get Acceleration telemetry"""
     result: ChData = fprime_test_api.assert_telemetry(
         "ReferenceDeployment.lsm6dsoManager.Acceleration", start="NOW", timeout=3
@@ -55,7 +30,7 @@ def test_01_acceleration_telemetry(fprime_test_api: IntegrationTestAPI):
     )
 
 
-def test_02_angular_velocity_telemetry(fprime_test_api: IntegrationTestAPI):
+def test_02_angular_velocity_telemetry(fprime_test_api: IntegrationTestAPI, start_gds):
     """Test that we can get AngularVelocity telemetry"""
     result: ChData = fprime_test_api.assert_telemetry(
         "ReferenceDeployment.lsm6dsoManager.AngularVelocity", start="NOW", timeout=3
@@ -67,7 +42,7 @@ def test_02_angular_velocity_telemetry(fprime_test_api: IntegrationTestAPI):
     )
 
 
-def test_03_temperature_telemetry(fprime_test_api: IntegrationTestAPI):
+def test_03_temperature_telemetry(fprime_test_api: IntegrationTestAPI, start_gds):
     """Test that we can get Temperature telemetry"""
     result: ChData = fprime_test_api.assert_telemetry(
         "ReferenceDeployment.lsm6dsoManager.Temperature", start="NOW", timeout=3
@@ -77,7 +52,7 @@ def test_03_temperature_telemetry(fprime_test_api: IntegrationTestAPI):
     assert reading != 0, "Temperature reading should be non-zero"
 
 
-def test_04_magnetic_field_telemetry(fprime_test_api: IntegrationTestAPI):
+def test_04_magnetic_field_telemetry(fprime_test_api: IntegrationTestAPI, start_gds):
     """Test that we can get MagneticField telemetry"""
     result: ChData = fprime_test_api.assert_telemetry(
         "ReferenceDeployment.lis2mdlManager.MagneticField", start="NOW", timeout=3

FprimeZephyrReference/test/int/rtc_test.py

@@ -5,8 +5,6 @@
 """
 
 import json
-import os
-import subprocess
 import time
 from datetime import datetime, timezone
 
@@ -18,27 +16,6 @@
 from fprime_gds.common.testing_fw.api import IntegrationTestAPI
 
 
-@pytest.fixture(scope="session", autouse=True)
-def start_gds(fprime_test_api_session: IntegrationTestAPI):
-    process = subprocess.Popen(["make", "gds-integration"], cwd=os.getcwd())
-
-    gds_working = False
-    timeout_time = time.time() + 30
-    while time.time() < timeout_time:
-        try:
-            fprime_test_api_session.send_and_assert_command(
-                command="CdhCore.cmdDisp.CMD_NO_OP"
-            )
-            gds_working = True
-            break
-        except Exception:
-            time.sleep(1)
-    assert gds_working
-
-    yield
-    process.kill()
-
-
 @pytest.fixture(autouse=True)
 def set_now_time(fprime_test_api: IntegrationTestAPI):
     """Fixture to set the time to test runner's time after each test"""
@@ -71,7 +48,7 @@ def set_time(fprime_test_api: IntegrationTestAPI, dt: datetime = None):
     fprime_test_api.assert_event("ReferenceDeployment.rtcManager.TimeSet", timeout=2)
 
 
-def test_01_time_set(fprime_test_api: IntegrationTestAPI):
+def test_01_time_set(fprime_test_api: IntegrationTestAPI, start_gds):
     """Test that we can set the time"""
 
     # Set time to Curiosity landing on Mars (7 minutes of terror! https://youtu.be/Ki_Af_o9Q9s)
@@ -114,7 +91,7 @@ def test_01_time_set(fprime_test_api: IntegrationTestAPI):
     pytest.approx(event_time, abs=30) == datetime.now(timezone.utc)
 
 
-def test_02_time_incrementing(fprime_test_api: IntegrationTestAPI):
+def test_02_time_incrementing(fprime_test_api: IntegrationTestAPI, start_gds):
     """Test that time increments over time"""
 
     # Fetch initial time
@@ -145,7 +122,7 @@ def test_02_time_incrementing(fprime_test_api: IntegrationTestAPI):
     )
 
 
-def test_03_time_not_set_event(fprime_test_api: IntegrationTestAPI):
+def test_03_time_not_set_event(fprime_test_api: IntegrationTestAPI, start_gds):
     """Test that a TimeNotSet event is emitted when setting time with invalid data"""
 
     # Clear histories

FprimeZephyrReference/test/int/watchdog_test.py

@@ -4,36 +4,13 @@
 Integration tests for the Watchdog component.
 """
 
-import os
-import subprocess
 import time
 
 import pytest
 from fprime_gds.common.data_types.ch_data import ChData
 from fprime_gds.common.testing_fw.api import IntegrationTestAPI
 
 
-@pytest.fixture(scope="session", autouse=True)
-def start_gds(fprime_test_api_session: IntegrationTestAPI):
-    process = subprocess.Popen(["make", "gds-integration"], cwd=os.getcwd())
-
-    gds_working = False
-    timeout_time = time.time() + 30
-    while time.time() < timeout_time:
-        try:
-            fprime_test_api_session.send_and_assert_command(
-                command="CdhCore.cmdDisp.CMD_NO_OP"
-            )
-            gds_working = True
-            break
-        except Exception:
-            time.sleep(1)
-    assert gds_working
-
-    yield
-    process.kill()
-
-
 @pytest.fixture(autouse=True)
 def ensure_watchdog_running(fprime_test_api: IntegrationTestAPI):
     """Fixture to ensure watchdog is started before and after each test"""
@@ -64,13 +41,13 @@ def get_watchdog_transitions(fprime_test_api: IntegrationTestAPI) -> int:
     return result.get_val()
 
 
-def test_01_watchdog_telemetry_basic(fprime_test_api: IntegrationTestAPI):
+def test_01_watchdog_telemetry_basic(fprime_test_api: IntegrationTestAPI, start_gds):
     """Test that we can read WatchdogTransitions telemetry"""
     value = get_watchdog_transitions(fprime_test_api)
     assert value >= 0, f"WatchdogTransitions should be >= 0, got {value}"
 
 
-def test_02_watchdog_increments(fprime_test_api: IntegrationTestAPI):
+def test_02_watchdog_increments(fprime_test_api: IntegrationTestAPI, start_gds):
     """Test that WatchdogTransitions increments over time"""
 
     initial_value = get_watchdog_transitions(fprime_test_api)
@@ -82,7 +59,7 @@ def test_02_watchdog_increments(fprime_test_api: IntegrationTestAPI):
     )
 
 
-def test_03_stop_watchdog_command(fprime_test_api: IntegrationTestAPI):
+def test_03_stop_watchdog_command(fprime_test_api: IntegrationTestAPI, start_gds):
     """
     Test STOP_WATCHDOG command sends and emits WatchdogStop
     event and WatchdogTransitions stops incrementing

Makefile

@@ -91,7 +91,7 @@ gds: ## Run FPrime GDS
 
 .PHONY: gds-integration
 gds-integration:
-	@$(GDS_COMMAND)
+	@$(GDS_COMMAND) --gui=none
 
 ##@ Build Tools
 BIN_DIR ?= $(shell pwd)/bin