fix: tests were not being run

Author: maxgallup

pyproject.toml

@@ -24,8 +24,8 @@ dev = ["pytest>=8.3.4", "ruff>=0.9.7"]
 
 # Tell pytest that all files in the /tests directory are tests
 [tool.pytest.ini_options]
-testpaths = ["tests"]
 python_files = "tests/*.py"
+# testpaths = ["tests"]
 python_functions = "test_*"
 python_classes = "Test*"
 

tests/testing.py tests/bootinfo.pytests/testing.py renamed to tests/bootinfo.py

@@ -35,6 +35,4 @@ def inject_valid_service():
         }
     }
 
-    os.environ["ASE_SERVICE"] = json.dumps(service)
-
-
+    os.environ["ASE_SERVICE"] = json.dumps(service)

tests/basic.py tests/test_basic.pytests/basic.py renamed to tests/test_basic.py

@@ -8,13 +8,10 @@
 from loguru import logger
 import roverlib.rovercom as rovercom
 import threading
-from .testing import inject_valid_service
+from .bootinfo import inject_valid_service
 
 runThread = True
 
-
-
-
 def send_continuous(stream : rover.WriteStream):
     while runThread:
         time.sleep(1)
@@ -56,32 +53,20 @@ def run(service : rover.Service, configuration : rover.ServiceConfiguration):
     thread_send = threading.Thread(target=send_continuous, args=(wr,), daemon=True)
     thread_send.start()
 
-  
-
     output = rd.Read()
 
     global runThread 
     runThread = False
-
 
     assert output.sensor_id == 2
 
-
-    
-    
-
-
-
 
 def onTerminate(sig : signal):
     logger.info("Terminating")
     return None
 
 
-
-inject_valid_service()
-
-
-rover.Run(run, onTerminate)
-
+def test_basic():
+    inject_valid_service()
+    rover.Run(run, onTerminate)
 

tests/tuning.py tests/test_tuning.pytests/tuning.py renamed to tests/test_tuning.py

@@ -1,30 +1,23 @@
 """
-tests for tuning
+Tests for tuning
 """
 
-
 import roverlib as rover
 import time
 import signal
 from loguru import logger
 import roverlib.rovercom as rovercom
 import zmq
-from .testing import inject_valid_service
-
-
+from .bootinfo import inject_valid_service
 
 def run(service : rover.Service, configuration : rover.ServiceConfiguration):
     ######################################################
-
     time.sleep(2)
-
     context = zmq.Context()
-
     socket = context.socket(zmq.PUB)
     socket.bind("tcp://*:8829")
 
     assert abs(configuration.GetFloatSafe("speed") - 1.5) < 0.01
-
 
     tuning = rovercom.TuningState(timestamp=int(time.time() * 1000), dynamic_parameters=[
         rovercom.TuningStateParameter(number=rovercom.TuningStateParameterNumberParameter(key="speed",value=1.1))
@@ -42,17 +35,10 @@ def run(service : rover.Service, configuration : rover.ServiceConfiguration):
 
 
 
-
-
-
 def onTerminate(sig : signal):
     logger.info("Terminating")
     return None
 
-
-
-
-inject_valid_service()
-
-
-rover.Run(run, onTerminate)
+def test_validation():
+    inject_valid_service()
+    rover.Run(run, onTerminate)