wip changes

Co-authored-by: Aaron Siemsen <[email protected]>

Author: hrfarmer

FprimeZephyrReference/test/int/imu_manager_test.py

@@ -7,11 +7,9 @@
 import os
 import subprocess
 import time
-from typing import List
 
 import pytest
 from fprime_gds.common.data_types.ch_data import ChData
-from fprime_gds.common.data_types.event_data import EventData
 from fprime_gds.common.testing_fw.api import IntegrationTestAPI
 
 
@@ -20,14 +18,16 @@ def start_gds(fprime_test_api_session: IntegrationTestAPI):
     process = subprocess.Popen(["make", "gds-integration"], cwd=os.getcwd())
 
     gds_working = False
-    timeout_time = time.time() + 15
+    timeout_time = time.time() + 30
     while time.time() < timeout_time:
-        data: List[EventData] = fprime_test_api_session.send_and_assert_command(
-            command="CdhCore.cmdDisp.CMD_NO_OP"
-        )
-        if data != []:
+        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

FprimeZephyrReference/test/int/rtc_test.py

@@ -5,6 +5,8 @@
 """
 
 import json
+import os
+import subprocess
 import time
 from datetime import datetime, timezone
 
@@ -16,6 +18,27 @@
 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"""

FprimeZephyrReference/test/int/watchdog_test.py

@@ -4,13 +4,36 @@
 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"""