Preserve Dual RX SITL failure diagnostics

Author: xznhj8129

src/test/dualrx/dualrx_mixed_sitl_test.py

@@ -5,11 +5,13 @@
 
 import argparse
 from pathlib import Path
+import shutil
 import socket
 import struct
 import tempfile
 import threading
 import time
+import traceback
 
 from dualrx_sitl_test import (
     BOX_BEEPER,
@@ -57,7 +59,7 @@ def __init__(self, name: str, channels: list[int], period_s: float = 0.02) -> No
         self._lock = threading.Lock()
         self._stop = threading.Event()
         self._thread: threading.Thread | None = None
-        self.error: BaseException | None = None
+        self.error: Exception | None = None
 
     def start(self) -> None:
         self._thread = threading.Thread(target=self._run_guarded, name=self.name, daemon=True)
@@ -76,12 +78,12 @@ def set_mode(self, mode: str) -> None:
 
     def check(self) -> None:
         if self.error is not None:
-            raise TestFailure(f"{self.name} background thread failed: {self.error}")
+            raise TestFailure(f"{self.name} background thread failed: {type(self.error).__name__}: {self.error}") from self.error
 
     def _run_guarded(self) -> None:
         try:
             self._run()
-        except BaseException as exc:
+        except Exception as exc:
             if not self._stop.is_set():
                 self.error = exc
                 self._stop.set()
@@ -342,9 +344,11 @@ def configure_case(kind: str) -> list[str]:
 
 def run_case(kind: str, binary: Path, repo: Path, tcp_base: int, temp_dir: Path) -> None:
     eeprom = temp_dir / f"{kind}.bin"
-    sitl = SitlProcess(binary, repo, eeprom, tcp_base, temp_dir / f"{kind}.log")
+    log_path = temp_dir / f"{kind}.log"
+    sitl = SitlProcess(binary, repo, eeprom, tcp_base, log_path)
     msp: MspClient | None = None
     ingresses: list = []
+    print(f"\n[CASE] {kind}")
     try:
         sitl.start()
         msp_port = tcp_port(tcp_base, UART_MSP)
@@ -386,6 +390,17 @@ def run_case(kind: str, binary: Path, repo: Path, tcp_base: int, temp_dir: Path)
         if kind == "crsf-mavlink":
             exercise_legacy_msp_override(msp, rx1, rx2)
         exercise_selector(msp, rx1, rx2, kind.replace("-", " + ").upper())
+    except Exception as exc:
+        process_code = sitl.process.poll() if sitl.process is not None else None
+        sitl_state = "still running" if sitl.process is not None and process_code is None else f"exited with code {process_code}"
+        log_tail = sitl.tail_log(lines=120)
+        raise TestFailure(
+            f"{kind} failed: {type(exc).__name__}: {exc}\n"
+            f"SITL state: {sitl_state}\n"
+            f"SITL log: {log_path}\n"
+            f"EEPROM: {eeprom}\n"
+            f"--- SITL LOG TAIL ---\n{log_tail}\n--- END SITL LOG TAIL ---"
+        ) from exc
     finally:
         for ingress in reversed(ingresses):
             ingress.close()
@@ -410,17 +425,20 @@ def main() -> int:
     print("Dual RX mixed-ingress SITL test")
     print(f"  repo: {repo}")
     print(f"  SITL: {binary}\n")
+
+    temp_dir = Path(tempfile.mkdtemp(prefix="inav-dualrx-mixed-"))
     try:
-        with tempfile.TemporaryDirectory(prefix="inav-dualrx-mixed-") as temp_name:
-            temp_dir = Path(temp_name)
-            for kind in ("crsf-mavlink", "crsf-msp", "mavlink-mavlink"):
-                run_case(kind, binary, repo, args.tcp_base, temp_dir)
-    except BaseException as exc:
-        print(f"\n[FAIL] {exc}")
+        for kind in ("crsf-mavlink", "crsf-msp", "mavlink-mavlink"):
+            run_case(kind, binary, repo, args.tcp_base, temp_dir)
+    except Exception:
+        print(f"\n[FAIL] Full diagnostics retained in: {temp_dir}")
+        traceback.print_exc()
         return 1
+
+    shutil.rmtree(temp_dir, ignore_errors=True)
     print("\nALL DUAL RX MIXED-INGRESS SITL TESTS PASSED")
     return 0
 
 
 if __name__ == "__main__":
-    raise SystemExit(main())
+    raise SystemExit(main())