refactor pytest markers and security plugins detection

Author: wcoleman-rti

modules/01-operating-room/pyproject.toml

@@ -25,33 +25,27 @@
 
 
 def pytest_collection_modifyitems(config, items):
-    """Fail tests when prerequisites are missing instead of silently skipping."""
-    fail_gui = pytest.mark.xfail(
+    """Skip tests when prerequisites are missing."""
+    skip_gui = pytest.mark.skip(
         reason="No graphical display available (need DISPLAY or WAYLAND_DISPLAY)",
-        strict=True,
-        run=False,
     )
-    fail_sec_artifacts = pytest.mark.xfail(
+    skip_sec_artifacts = pytest.mark.skip(
         reason="Security artifacts not generated (run setup_security.py)",
-        strict=True,
-        run=False,
     )
-    fail_sec_plugin = pytest.mark.xfail(
-        reason="DDS Security plugin not fully installed "
-        "(need libnddssecurity, OpenSSL, rti_license.dat)",
-        strict=True,
-        run=False,
+    skip_sec_plugin = pytest.mark.skip(
+        reason="DDS Security runtime probe failed",
     )
 
     has_display = _has_display()
+    module_items = [i for i in items if Path(i.fspath).is_relative_to(TESTS_DIR)]
 
-    for item in items:
+    for item in module_items:
         if "gui" in item.keywords and not has_display:
-            item.add_marker(fail_gui)
+            item.add_marker(skip_gui)
         if "secure" in item.keywords and not _security_artifacts_exist():
-            item.add_marker(fail_sec_artifacts)
+            item.add_marker(skip_sec_artifacts)
         elif "secure" in item.keywords and not _security_plugin_available():
-            item.add_marker(fail_sec_plugin)
+            item.add_marker(skip_sec_plugin)
 
 
 @pytest.fixture(scope="session")

modules/01-operating-room/tests/conftest.py

@@ -22,6 +22,7 @@
 import subprocess
 import sys
 import time
+from functools import lru_cache
 from pathlib import Path
 
 # Make resource/python/ importable — the `scripts` package contains
@@ -33,6 +34,7 @@
 # Make src/ importable so tests can use generated Types module directly.
 sys.path.insert(0, str(Path(__file__).resolve().parent.parent / "src"))
 
+from scripts.security_utils import check_security
 
 # ---------------------------------------------------------------------------
 # Path bootstrapping — mirror what the launch scripts do
@@ -67,28 +69,10 @@ def _security_artifacts_exist() -> bool:
     return any(domain_scope_dir.rglob("*.p7s"))
 
 
+@lru_cache(maxsize=1)
 def _security_plugin_available() -> bool:
-    """Return True when the DDS Security plugin is fully usable.
-
-    Requires:
-    1. ``libnddssecurity`` shared library
-    2. Bundled OpenSSL ``release/lib`` directory
-    3. A valid ``rti_license.dat`` in NDDSHOME (Security Plugins are
-       a licensed feature).
-    """
-    nddshome = os.environ.get("NDDSHOME")
-    if not nddshome:
-        return False
-    nddshome_path = Path(nddshome)
-    has_plugin = bool(list(nddshome_path.glob("lib/*/libnddssecurity.*")))
-    has_openssl = any(
-        (arch / "release" / "lib").is_dir()
-        for arch in nddshome_path.glob("third_party/openssl-*/*")
-    )
-    has_license = (nddshome_path / "rti_license.dat").is_file() and (
-        (nddshome_path / "rti_license.dat").stat().st_size > 0
-    )
-    return has_plugin and has_openssl and has_license
+    """Return True when secure participant creation succeeds at runtime."""
+    return check_security()
 
 
 # ---------------------------------------------------------------------------

modules/01-operating-room/tests/module01_test_support.py

@@ -0,0 +1,39 @@
+#
+# (c) 2026 Copyright, Real-Time Innovations, Inc. (RTI) All rights reserved.
+#
+# RTI grants Licensee a license to use, modify, compile, and create derivative
+# works of the software solely for use with RTI Connext DDS.  Licensee may
+# redistribute copies of the software provided that all such copies are
+# subject to this license. The software is provided "as is", with no warranty
+# of any type, including any warranty for fitness for any purpose. RTI is
+# under no obligation to maintain or support the software.  RTI shall not be
+# liable for any incidental or consequential damages arising out of the use or
+# inability to use the software.
+"""Build verification tests for Module 01.
+
+Ensures the CMake build succeeds, expected binaries are produced,
+and the generated Python types are importable.
+"""
+
+import sys
+from pathlib import Path
+
+import pytest
+from module01_test_support import MODULE_DIR
+
+sys.path.insert(0, str(MODULE_DIR.parent.parent / "resource" / "python"))
+from scripts import platform_setup
+
+# ---------------------------------------------------------------------------
+# Build
+# ---------------------------------------------------------------------------
+
+
+class TestBuild:
+    """Validate that the project-level CMake build produced expected binaries."""
+
+    @pytest.mark.parametrize("binary", ["PatientSensor", "Orchestrator", "ArmController"])
+    def test_binary_exists(self, binary: str):
+        """Compiled C++ binary exists and can be located."""
+        exe = platform_setup.find_executable(binary)
+        assert Path(exe).is_file(), f"Binary not found: {exe}"

modules/01-operating-room/tests/test_build.py

@@ -296,6 +296,7 @@ def test_vitals_flow_with_security(self, proc_manager_secure, dds_env_secure):
 
 
 @pytest.mark.secure
+@pytest.mark.gui
 class TestSecureAllApps:
     """All C++ apps should launch successfully in secure mode."""
 

modules/01-operating-room/tests/test_build_and_types.py

@@ -25,12 +25,13 @@
 
 
 def pytest_collection_modifyitems(config, items):
-    """Auto-skip all tests if Recording/Replay Service is not available."""
+    """Auto-skip @service-marked tests if Recording/Replay Service is not available."""
     if RECORDING_SERVICE and REPLAY_SERVICE:
         return
     skip = pytest.mark.skip(reason="RTI Recording/Replay Service not found in NDDSHOME/bin/")
     for item in items:
-        item.add_marker(skip)
+        if Path(item.fspath).is_relative_to(TESTS_DIR) and "service" in item.keywords:
+            item.add_marker(skip)
 
 
 @pytest.fixture(scope="session")

modules/01-operating-room/tests/test_demo_flow.py

@@ -26,6 +26,7 @@
 )
 
 
+@pytest.mark.service
 @pytest.mark.slow
 class TestRecording:
     """RTI Recording Service should capture data from running applications."""

modules/02-record-playback/pyproject.toml

@@ -33,6 +33,7 @@
 SRC_DIR = MODULE_01_DIR / "src"
 
 
+@pytest.mark.service
 @pytest.mark.slow
 class TestReplay:
     """RTI Replay Service should re-publish recorded data."""