fix: correct revit_launch & auto-capture print output

- Wire revit_launch option properly: force-launch spawns new Revit instead of reusing existing free instances
- Fix double-run bug: wait_for_revit_pipe now filters by exact PID of newly-spawned process, preventing connection to old instances
- Disconnect old bridge before force-launching to avoid stale pipe state
- Auto-enable -rP (show captured stdout for passing tests) by default
- Remove dead code: DiscoverRequest/Response models, BRIDGE_METHOD_TESTS_DISCOVER constant, _prune_stale method, prefer_fresh parameter
- Fix _opt_bool to correctly read INI fallback when CLI default is False

Author: trgiangv

pyproject.toml

@@ -41,5 +41,5 @@ packages = ["src/revitdevtool_pytest"]
 testpaths = ["tests"]
 revit_version = "2025"
 revit_timeout = "60"
-revit_launch = true
+revit_launch = false
 revit_launch_timeout = "180"

src/revitdevtool_pytest/connection.py

@@ -58,13 +58,17 @@ def ensure_bridge(
     explicit_pipe: str | None,
     suite_key: str,
     suite_path: str,
-    prefer_fresh: bool = False,
+    force_launch: bool = False,
 ) -> ConnectionResult:
-    """Main entry point: return a connected bridge or an error."""
-    if not prefer_fresh and current_bridge is not None and current_bridge.connected:
+    """Main entry point: return a connected bridge or an error.
+
+    When *force_launch* is True, skip reusing existing instances and always
+    spawn a fresh Revit process (requires --revit-version).
+    """
+    if not force_launch and current_bridge is not None and current_bridge.connected:
         return ConnectionResult(bridge=current_bridge)
 
-    if explicit_pipe and not prefer_fresh:
+    if explicit_pipe and not force_launch:
         return _connect_explicit_pipe_or_exit(explicit_pipe)
 
     return _connect_discovered_or_launched(
@@ -73,7 +77,7 @@ def ensure_bridge(
         lease_store=lease_store,
         version=version,
         launch_timeout_s=launch_timeout_s,
-        prefer_fresh=prefer_fresh,
+        force_launch=force_launch,
     )
 
 
@@ -84,17 +88,17 @@ def _connect_discovered_or_launched(
     lease_store: SuiteLeaseStore | None,
     version: int | None,
     launch_timeout_s: float,
-    prefer_fresh: bool,
+    force_launch: bool,
 ) -> ConnectionResult:
     instances = instances_for_version(version)
 
-    if lease_store is not None:
-        bridge, _ = _try_reconnect_leased(lease_store, suite_key, suite_path, instances)
-        if bridge is not None:
-            return ConnectionResult(bridge=bridge)
-        instances = instances_for_version(version)
+    if not force_launch:
+        if lease_store is not None:
+            bridge, _ = _try_reconnect_leased(lease_store, suite_key, suite_path, instances)
+            if bridge is not None:
+                return ConnectionResult(bridge=bridge)
+            instances = instances_for_version(version)
 
-    if not prefer_fresh:
         free = lease_store.find_free(suite_key, instances) if lease_store else instances
         bridge, error = _connect_and_lease(free, suite_key, suite_path, lease_store, "Assigned free instance")
         if bridge is not None:
@@ -136,7 +140,7 @@ def auto_launch(version: int, launch_timeout_s: float) -> LaunchResult:
     except ImportError:
         pass
 
-    instance = wait_for_revit_pipe(version, timeout_s=launch_timeout_s)
+    instance = wait_for_revit_pipe(version, timeout_s=launch_timeout_s, process_id=process_id)
     if instance is None:
         pytest.exit(
             f"{PLUGIN_NAME}: Revit {version} launched but Named Pipe did not appear within {launch_timeout_s}s.",

src/revitdevtool_pytest/constants.py

@@ -4,7 +4,6 @@
 
 PLUGIN_NAME: Final = "RevitDevTool.PyTest"
 
-BRIDGE_METHOD_TESTS_DISCOVER: Final = "tests/discover"
 BRIDGE_METHOD_TESTS_RUN: Final = "tests/run"
 BRIDGE_MSG_TYPE_NOTIFICATION: Final = "notification"
 BRIDGE_NOTIFY_TEST_PROGRESS: Final = "notifications/tests/progress"

src/revitdevtool_pytest/discovery.py

@@ -91,11 +91,20 @@ def wait_for_revit_pipe(
     version: int | None = None,
     timeout_s: float = DEFAULT_LAUNCH_TIMEOUT_S,
     poll_interval_s: float = DEFAULT_POLL_INTERVAL_S,
+    process_id: int | None = None,
 ) -> RevitInstance | None:
-    """Block until a Revit pipe matching *version* appears."""
+    """Block until a Revit pipe appears.
+
+    When *process_id* is given, wait for that exact process to register its pipe.
+    Otherwise fall back to version-based selection.
+    """
     deadline = time.monotonic() + timeout_s
     while time.monotonic() < deadline:
-        match = select_instance(find_revit_pipes(), version)
+        instances = find_revit_pipes()
+        if process_id is not None:
+            match = next((i for i in instances if i.process_id == process_id), None)
+        else:
+            match = select_instance(instances, version)
         if match is not None:
             return match
         time.sleep(poll_interval_s)

src/revitdevtool_pytest/models.py

@@ -60,16 +60,6 @@ def from_json(cls, data: dict[str, Any]) -> BridgeResponse:
 # -- Request contracts (mirrors PytestContracts.cs requests) -----------------
 
 
-@dataclass(slots=True)
-class DiscoverRequest:
-    workspace_root: str = ""
-    test_root: str = ""
-    pytest_args: list[str] = field(default_factory=list)
-
-    def to_params(self) -> dict[str, Any]:
-        return asdict(self)
-
-
 @dataclass(slots=True)
 class RunRequest:
     workspace_root: str = ""
@@ -126,23 +116,6 @@ def from_dict(cls, data: dict[str, Any]) -> RunSummary:
         return _deserialize(cls, data)
 
 
-@dataclass(frozen=True, slots=True)
-class DiscoverResponse:
-    rootdir: str = ""
-    nodeids: tuple[str, ...] = ()
-    collection_errors: tuple[CollectionError, ...] = ()
-
-    @classmethod
-    def from_dict(cls, data: dict[str, Any]) -> DiscoverResponse:
-        return cls(
-            rootdir=data.get("rootdir", ""),
-            nodeids=tuple(data.get("nodeids", [])),
-            collection_errors=tuple(
-                CollectionError.from_dict(e) for e in data.get("collection_errors", [])
-            ),
-        )
-
-
 @dataclass(frozen=True, slots=True)
 class RunResponse:
     exit_code: int = 1

src/revitdevtool_pytest/plugin.py

@@ -74,7 +74,7 @@ def pytest_addoption(parser: pytest.Parser) -> None:
     )
     grp.addoption(
         "--revit-launch", dest=OPT_LAUNCH, action="store_true", default=False,
-        help="Auto-launch Revit if no running instance is found. Requires --revit-version.",
+        help="Force-launch a new Revit instance (skip reusing existing). Requires --revit-version.",
     )
     grp.addoption(
         "--revit-launch-timeout", dest=OPT_LAUNCH_TIMEOUT, default=None, type=float,
@@ -84,7 +84,7 @@ def pytest_addoption(parser: pytest.Parser) -> None:
     parser.addini(OPT_VERSION, "Revit version year", type="string", default=None)
     parser.addini(OPT_TIMEOUT, "Per-test timeout (seconds)", type="string", default=str(DEFAULT_TEST_TIMEOUT_S))
     parser.addini(OPT_PIPE, "Explicit pipe name", type="string", default=None)
-    parser.addini(OPT_LAUNCH, "Auto-launch Revit", type="bool", default=False)
+    parser.addini(OPT_LAUNCH, "Force-launch a new Revit instance (skip reusing existing)", type="bool", default=False)
     parser.addini(OPT_LAUNCH_TIMEOUT, "Launch timeout (seconds)", type="string", default=str(DEFAULT_LAUNCH_TIMEOUT_S))
 
 
@@ -96,6 +96,10 @@ def pytest_addoption(parser: pytest.Parser) -> None:
 def pytest_configure(config: pytest.Config) -> None:
     config.addinivalue_line("markers", "revit: mark test to run inside Revit process")
 
+    reportchars = getattr(config.option, "reportchars", "") or ""
+    if "P" not in reportchars:
+        config.option.reportchars = reportchars + "P"
+
     global _lease_store  # noqa: PLW0603
     _lease_store = SuiteLeaseStore()
 
@@ -192,6 +196,11 @@ def _ensure_bridge(session: pytest.Session) -> bool:
             returncode=EXIT_CODE_CONFIG_ERROR,
         )
 
+    force_launch = _opt_bool(config, OPT_LAUNCH, OPT_LAUNCH)
+    if force_launch and _bridge is not None:
+        _bridge.disconnect()
+        _bridge = None
+
     result = ensure_bridge(
         current_bridge=_bridge,
         lease_store=_lease_store,
@@ -200,6 +209,7 @@ def _ensure_bridge(session: pytest.Session) -> bool:
         explicit_pipe=explicit_pipe,
         suite_key=suite_key,
         suite_path=suite_path,
+        force_launch=force_launch,
     )
     if result.dialog_resolver is not None:
         _dialog_resolver = result.dialog_resolver
@@ -235,6 +245,14 @@ def _opt_float(config: pytest.Config, cli: str, ini: str) -> float | None:
     return float(raw) if raw else None
 
 
+def _opt_bool(config: pytest.Config, cli: str, ini: str) -> bool:
+    cli_val = config.getoption(cli, default=None)
+    if cli_val:
+        return True
+    ini_val = config.getini(ini)
+    return bool(ini_val)
+
+
 def _is_collect_only(config: pytest.Config) -> bool:
     option = getattr(config, "option", None)
     return bool(getattr(option, "collectonly", False))

src/revitdevtool_pytest/suite_leasing.py

@@ -99,18 +99,6 @@ def clear_suite(self, suite_key: str) -> None:
         self._leases.pop(suite_key, None)
         self._save_leases()
 
-    def _prune_stale(self, active_by_pid: dict[int, RevitInstance]) -> None:
-        stale = [
-            key
-            for key, lease in self._leases.items()
-            if lease.process_id not in active_by_pid
-        ]
-        if not stale:
-            return
-        for key in stale:
-            self._leases.pop(key, None)
-        self._save_leases()
-
     def _load_leases(self) -> dict[str, SuiteLease]:
         if not self._state_file.is_file():
             return {}
@@ -156,7 +144,7 @@ def _save_leases(self) -> None:
             except PermissionError:
                 try:
                     tmp_file.unlink(missing_ok=True)
-                except Exception:
+                except Exception: # noqa
                     pass
                 if delay is None:
                     raise