refactor shared test infrastructure

Author: wcoleman-rti

docs/CONTRIBUTING.md

@@ -58,26 +58,26 @@ not need to invoke them manually.
 
 ```bash
 # Python lint
-ruff check .
+ruff check
 
 # Python formatting
-ruff format .
+ruff format
 
 # Spelling
-codespell --toml pyproject.toml
+codespell
 
 # Markdown lint/format
-rumdl check .
-rumdl fmt .
+rumdl check
+rumdl fmt
 
 # Run all tests from project root (repo-level + modules)
-python -m pytest -v
+pytest
 
 # Run project-level tests only
-python -m pytest tests/ -v
+pytest tests/
 
 # Run a specific module
-python -m pytest modules/01-operating-room/tests/ -v
+pytest modules/01-operating-room/tests/
 ```
 
 ### On every `git commit` (automatic)
@@ -125,7 +125,7 @@ committing. In exceptional circumstances you can bypass hooks with
 
 | Job | What it does |
 | --- | --- |
-| Lint & Format | `ruff check .`, `ruff format --check .`, codespell, clang-format dry-run, markdown lint via `rvben/rumdl` action |
+| Lint & Format | `ruff check`, `ruff format --check`, codespell, clang-format dry-run, markdown lint via `rvben/rumdl` action |
 | Build | CMake configure + build all C++ modules |
 | Project-level Tests | `pytest tests/` |
 | Unit Tests | Fast Python type/script/QoS tests |
@@ -167,13 +167,13 @@ act push -j test \
 
 ```bash
 # All tests from project root (repo-level + modules)
-python -m pytest -v
+pytest -v
 
 # Project-level tests only
-python -m pytest tests/ -v
+pytest tests/ -v
 
 # Single module
-python -m pytest modules/01-operating-room/tests/ -v
+pytest modules/01-operating-room/tests/ -v
 ```
 
 ### Option 2 — Docker (closest to CI)
@@ -191,7 +191,7 @@ docker compose -f tests/docker/docker-compose.yml run --rm --build test \
     modules/01-operating-room/tests/test_types.py -v
 ```
 
-> **Note:** The Docker default command runs `python -m pytest -v` via the
+> **Note:** The Docker default command runs `pytest -v` via the
 > test entrypoint. It executes functional/behavioral tests. It does **not** run Ruff lint,
 > rumdl markdown lint, or clang-format; those are enforced by pre-commit
 > (locally) and the CI lint job (on push/PR).
@@ -219,8 +219,8 @@ In summary:
 Before opening a PR, verify:
 
 - [ ] `pre-commit run --all-files` passes cleanly
-- [ ] `python -m pytest tests/` passes locally
-- [ ] `python -m pytest -v` passes locally
+- [ ] `pytest tests/` passes locally
+- [ ] `pytest -v` passes locally
 - [ ] `CHANGELOG.md` updated if the change is user-visible
 - [ ] No `# noqa` suppressions added without a documented justification
 

modules/01-operating-room/tests/README.md

@@ -21,25 +21,25 @@ From the `modules/01-operating-room/` directory:
 
 ```bash
 # All tests (requires display for GUI tests)
-python -m pytest tests/ -v
+pytest tests/ -v
 
 # Skip GUI tests (headless / CI)
-python -m pytest tests/ -v -m "not gui"
+pytest tests/ -v -m "not gui"
 
 # Skip slow end-to-end tests
-python -m pytest tests/ -v -m "not slow"
+pytest tests/ -v -m "not slow"
 
 # Only fast, non-GUI tests (best for quick validation)
-python -m pytest tests/ -v -m "not gui and not slow"
+pytest tests/ -v -m "not gui and not slow"
 
 # Only DDS communication tests
-python -m pytest tests/test_dds_communication.py -v
+pytest tests/test_dds_communication.py -v
 
 # Only security tests (requires setup_security.py)
-python -m pytest tests/ -v -m "secure"
+pytest tests/ -v -m "secure"
 
 # Skip security tests
-python -m pytest tests/ -v -m "not secure"
+pytest tests/ -v -m "not secure"
 ```
 
 ## Test Structure

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

@@ -1,7 +1,6 @@
 """Pytest-only hooks and fixtures for Module 01 tests."""
 
 import importlib
-import os
 import sys
 from pathlib import Path
 
@@ -17,11 +16,22 @@
 module_runner = importlib.import_module("scripts.module_runner")
 
 MODULE_DIR = module01_test_support.MODULE_DIR
-ProcessManager = module01_test_support.ProcessManager
 SECURITY_DIR = module01_test_support.SECURITY_DIR
-_has_display = module01_test_support._has_display
-_security_artifacts_exist = module01_test_support._security_artifacts_exist
-_security_plugin_available = module01_test_support._security_plugin_available
+
+from scripts.test_utils import (  # noqa: E402
+    ProcessManager,
+    UtilityApp,
+    has_display,
+    security_plugin_available,
+)
+
+
+def _security_artifacts_exist() -> bool:
+    """Return True when setup_security.py has been run for module 01."""
+    domain_scope_dir = SECURITY_DIR / "domain_scope"
+    if not domain_scope_dir.is_dir():
+        return False
+    return any(domain_scope_dir.rglob("*.p7s"))
 
 
 def pytest_collection_modifyitems(config, items):
@@ -36,28 +46,31 @@ def pytest_collection_modifyitems(config, items):
         reason="DDS Security runtime probe failed",
     )
 
-    has_display = _has_display()
+    _has_display = has_display()
+    __has_security_plugin = security_plugin_available()
+    _has_security_artifacts = _security_artifacts_exist()
+
     module_items = [i for i in items if Path(i.fspath).is_relative_to(TESTS_DIR)]
 
     for item in module_items:
-        if "gui" in item.keywords and not has_display:
+        if "gui" in item.keywords and not _has_display:
             item.add_marker(skip_gui)
-        if "secure" in item.keywords and not _security_artifacts_exist():
+        if "secure" in item.keywords and not _has_security_artifacts:
             item.add_marker(skip_sec_artifacts)
-        elif "secure" in item.keywords and not _security_plugin_available():
+        elif "secure" in item.keywords and not __has_security_plugin:
             item.add_marker(skip_sec_plugin)
 
 
 @pytest.fixture(scope="session")
 def dds_env():
-    """Session-scoped environment dict with NDDS_QOS_PROFILES configured (non-secure)."""
+    """Session-scoped environment for non-secure subprocess launches."""
     env, apps = module_runner.load_module_config(MODULE_DIR, flags={"security": False})
     return env, apps
 
 
 @pytest.fixture(scope="session")
 def dds_env_secure():
-    """Session-scoped environment dict with NDDS_QOS_PROFILES + DDS Security."""
+    """Session-scoped environment for secure subprocess launches."""
     env, apps = module_runner.load_module_config(MODULE_DIR, flags={"security": True})
     env["RTI_SECURITY_ARTIFACTS_DIR"] = str(SECURITY_DIR)
     return env, apps
@@ -67,7 +80,7 @@ def dds_env_secure():
 def proc_manager(dds_env):
     """Yield a ProcessManager wired to the non-secure DDS environment."""
     env, apps = dds_env
-    pm = ProcessManager(env, apps)
+    pm = ProcessManager(env, apps, cwd=MODULE_DIR)
     yield pm
     pm.shutdown_all()
 
@@ -76,7 +89,7 @@ def proc_manager(dds_env):
 def class_proc_manager(dds_env):
     """Class-scoped ProcessManager for read-only test classes."""
     env, apps = dds_env
-    pm = ProcessManager(env, apps)
+    pm = ProcessManager(env, apps, cwd=MODULE_DIR)
     yield pm
     pm.shutdown_all()
 
@@ -85,21 +98,14 @@ def class_proc_manager(dds_env):
 def proc_manager_secure(dds_env_secure):
     """Yield a ProcessManager wired to the secure DDS environment."""
     env, apps = dds_env_secure
-    pm = ProcessManager(env, apps)
+    pm = ProcessManager(env, apps, cwd=MODULE_DIR)
     yield pm
     pm.shutdown_all()
 
 
 @pytest.fixture()
-def dds_participant(dds_env):
-    """Create a lightweight DDS DomainParticipant for test observation."""
-    import rti.connextdds as dds
-
-    env, _apps = dds_env
-    os.environ["NDDS_QOS_PROFILES"] = env["NDDS_QOS_PROFILES"]
-
-    provider = dds.QosProvider.default
-    participant_qos = provider.participant_qos_from_profile("DpQosLib::Test")
-    participant = dds.DomainParticipant(domain_id=0, qos=participant_qos)
-    yield participant
-    participant.close()
+def nonsecure_utility_app():
+    """Create a UtilityApp for in-process DDS observation."""
+    app = UtilityApp.make_non_secure()
+    yield app
+    app.close()