Merge pull request #2 from julianneswinoga/feature/js/jsbsim-integrat…

…ion-tests

Feature/js/jsbsim integration tests

.circleci/config.yml

@@ -26,6 +26,18 @@ jobs:
       - run:
           name: Poetry show version
           command: poetry --version
+      - when:
+          # 3.10 has a problem with numpy 1.19.5, from JSBSim
+          # This hack can be removed when 3.6 support is dropped
+          condition:
+            equal: [ "3.10", << parameters.python-version >> ]
+          steps:
+            - run:
+                name: Remove JSBSim
+                command: poetry remove --dev JSBSim
+            - run:
+                name: Delete JSBSim tests
+                command: rm --verbose tests/test_*JSBSim*.py
       - run:
           name: Poetry build
           command: poetry build --no-ansi --no-interaction

flightgear_python/fg_if.py

@@ -79,7 +79,6 @@ def connect_tx(self, fg_host: str, fg_port: int):
     def _fg_packet_roundtrip(self):
         # Receive up to 1KB of data from FG
         # blocking is fine here since we're in a separate process
-
         try:
             rx_msg, _ = self.fg_rx_sock.recvfrom(1024)
         except socket.timeout as e:
@@ -106,6 +105,7 @@ def _rx_process(self):
             print(f'Warning: TX not connected, not sending updates to FG for RX {self.fg_rx_sock.getsockname()}')
 
         self.fg_rx_sock.settimeout(self.rx_timeout_s)
+        self.event_pipe.child_send((True,))  # Signal to parent that child is running
         while True:
             self._fg_packet_roundtrip()
 
@@ -115,6 +115,7 @@ def start(self):
         """
         self.rx_proc = mp.Process(target=self._rx_process)
         self.rx_proc.start()
+        _ = self.event_pipe.parent_recv()  # Wait for child to actually run
 
     def stop(self):
         """

pyproject.toml

@@ -24,6 +24,7 @@ pytest-cov = "^3.0.0"
 pytest = "==7.0.1"
 GitPython = "==3.1.20"
 pytest-mock = "==3.6.1"
+JSBSim = "==1.1.11"
 
 [tool.poetry.urls]
 "Repository" = "https://github.com/julianneswinoga/flightgear-python"

scripts/run_tests.sh

@@ -1,11 +1,17 @@
 #!/bin/bash
 set -e
 
-python3.6 -m venv --clear .venv
+if [ "$1" = 'clean' ]; then
+  python3.6 -m venv --clear .venv
+fi
+
 . ./.venv/bin/activate
-pip3 install -U pip
-pip3 install -U poetry
-poetry update
+
+if [ "$1" = 'clean' ]; then
+  pip3 install -U pip
+  pip3 install -U poetry
+  poetry update
+fi
 poetry build
 poetry install
 pytest --cov-report term-missing:skip-covered --cov=flightgear_python tests/