tenzir-test 0.15.0__tar.gz → 1.0.0__tar.gz

{tenzir_test-0.15.0 → tenzir_test-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tenzir-test
-Version: 0.15.0
+Version: 1.0.0
 Summary: Reusable test execution framework extracted from the Tenzir repository.
 Project-URL: Homepage, https://github.com/tenzir/test
 Project-URL: Repository, https://github.com/tenzir/test

tenzir_test-1.0.0/changelog/releases/v1.0.0/entries/auto-detect-tenzir-binary-with-uvx-fallback.md

@@ -0,0 +1,11 @@
+---
+title: Auto-detect Tenzir binary with uvx fallback
+type: breaking
+authors:
+  - mavam
+  - claude
+pr: 7
+created: 2026-01-23T13:05:39.988216Z
+---
+
+Binary detection now follows a consistent precedence order: environment variable `TENZIR_BINARY` takes priority, followed by a PATH lookup, with `uvx` as the final fallback. The same logic applies to `TENZIR_NODE_BINARY`. Environment variables now support multi-part commands like `TENZIR_BINARY="uvx tenzir"`, giving you full control over how binaries are invoked. The `--tenzir-binary` and `--tenzir-node-binary` CLI flags have been removed in favor of environment variables, which provide more flexibility and clarity.

tenzir_test-1.0.0/changelog/releases/v1.0.0/manifest.yaml

@@ -0,0 +1,8 @@
+created: 2026-01-23
+title: Automatic Binary Detection
+intro: >-
+  This release introduces automatic binary detection with a clear precedence order:
+  environment variables take priority, followed by PATH lookup, with `uvx` as fallback.
+  Environment variables now support multi-part commands for full control over binary
+  invocation. The `--tenzir-binary` and `--tenzir-node-binary` CLI flags have been
+  removed in favor of environment variables.

tenzir_test-1.0.0/changelog/releases/v1.0.0/notes.md

@@ -0,0 +1,9 @@
+This release introduces automatic binary detection with a clear precedence order: environment variables take priority, followed by PATH lookup, with `uvx` as fallback. Environment variables now support multi-part commands for full control over binary invocation. The `--tenzir-binary` and `--tenzir-node-binary` CLI flags have been removed in favor of environment variables.
+
+## 💥 Breaking changes
+
+### Auto-detect Tenzir binary with uvx fallback
+
+Binary detection now follows a consistent precedence order: environment variable `TENZIR_BINARY` takes priority, followed by a PATH lookup, with `uvx` as the final fallback. The same logic applies to `TENZIR_NODE_BINARY`. Environment variables now support multi-part commands like `TENZIR_BINARY="uvx tenzir"`, giving you full control over how binaries are invoked. The `--tenzir-binary` and `--tenzir-node-binary` CLI flags have been removed in favor of environment variables, which provide more flexibility and clarity.
+
+*By @mavam and @claude in #7.*

{tenzir_test-0.15.0 → tenzir_test-1.0.0}/example-project/README.md

@@ -7,10 +7,12 @@ pieces fit together.
 
 ## Prerequisites
 
-- A `tenzir` binary on your `PATH`, or an explicit `TENZIR_BINARY`.
-- `tenzir-node` for scenarios that talk to a running node.
 - Python 3.12+ with [`uv`](https://docs.astral.sh/uv/) (used in the commands
   below).
+- A `tenzir` binary on your `PATH`. If not found, the harness falls back to
+  `uvx tenzir` when `uv` is installed. Set `TENZIR_BINARY` to override.
+- `tenzir-node` for scenarios that talk to a running node. Same fallback logic
+  applies via `TENZIR_NODE_BINARY`.
 
 ## Layout
 
@@ -83,7 +85,7 @@ example-project/
 - **Satellite demo** (`../example-satellite/`): a self-contained project that
   reuses the root fixtures **and** the `xxd` runner while adding its own
   `satellite_marker` fixture. Invoke `uvx tenzir-test --root example-project
-  example-satellite` to run both projects in one go.
+example-satellite` to run both projects in one go.
 
 Every scenario keeps its expected output in a neighbouring `.txt` file. Run with
 `--update` after deliberate behaviour changes to refresh the baselines.

{tenzir_test-0.15.0 → tenzir_test-1.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tenzir-test"
-version = "0.15.0"
+version = "1.0.0"
 description = "Reusable test execution framework extracted from the Tenzir repository."
 readme = "README.md"
 requires-python = ">=3.12"

{tenzir_test-0.15.0 → tenzir_test-1.0.0}/src/tenzir_test/_python_runner.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import json
 import os
 import runpy
+import shlex
 import sys
 from contextvars import Token
 from pathlib import Path
@@ -49,14 +50,18 @@ def _push_context_from_env() -> Token[Any] | None:
     config_args_raw = payload.get("config_args", ())
     config_args = tuple(str(arg) for arg in config_args_raw)
     env = dict(os.environ)
+    tenzir_binary_str = env.get("TENZIR_PYTHON_FIXTURE_BINARY") or env.get("TENZIR_BINARY")
+    tenzir_node_binary_str = env.get("TENZIR_NODE_BINARY")
     context = _fixtures.FixtureContext(
         test=test_path,
         config=config,
         coverage=coverage,
         env=env,
         config_args=config_args,
-        tenzir_binary=env.get("TENZIR_PYTHON_FIXTURE_BINARY") or env.get("TENZIR_BINARY"),
-        tenzir_node_binary=env.get("TENZIR_NODE_BINARY"),
+        tenzir_binary=tuple(shlex.split(tenzir_binary_str)) if tenzir_binary_str else None,
+        tenzir_node_binary=tuple(shlex.split(tenzir_node_binary_str))
+        if tenzir_node_binary_str
+        else None,
     )
     token = _fixtures.push_context(context)
     return cast(Token[Any], token)

{tenzir_test-0.15.0 → tenzir_test-1.0.0}/src/tenzir_test/cli.py

@@ -39,18 +39,6 @@ def _normalize_exit_code(value: object) -> int:
     ),
     help="Project root to scan for tests.",
 )
-@click.option(
-    "tenzir_binary",
-    "--tenzir-binary",
-    type=click.Path(path_type=Path, dir_okay=False, writable=False, resolve_path=False),
-    help="Path to the tenzir executable.",
-)
-@click.option(
-    "tenzir_node_binary",
-    "--tenzir-node-binary",
-    type=click.Path(path_type=Path, dir_okay=False, writable=False, resolve_path=False),
-    help="Path to the tenzir-node executable.",
-)
 @click.option(
     "package_dirs",
     "--package-dirs",
@@ -150,8 +138,6 @@ def cli(
     ctx: click.Context,
     *,
     root: Path | None,
-    tenzir_binary: Path | None,
-    tenzir_node_binary: Path | None,
     package_dirs: tuple[str, ...],
     tests: tuple[Path, ...],
     update: bool,
@@ -186,8 +172,6 @@ def cli(
     try:
         result = runtime.run_cli(
             root=root,
-            tenzir_binary=tenzir_binary,
-            tenzir_node_binary=tenzir_node_binary,
             package_dirs=package_paths,
             tests=list(tests),
             update=update,

tenzir_test-1.0.0/src/tenzir_test/config.py

@@ -0,0 +1,70 @@
+from __future__ import annotations
+
+import os
+import shlex
+import shutil
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Mapping
+
+
+@dataclass(slots=True)
+class Settings:
+    """Configuration values steering how the harness discovers binaries and data."""
+
+    root: Path
+    tenzir_binary: tuple[str, ...] | None
+    tenzir_node_binary: tuple[str, ...] | None
+
+    @property
+    def inputs_dir(self) -> Path:
+        direct = self.root / "inputs"
+        if direct.exists():
+            return direct
+        nested = self.root / "tests" / "inputs"
+        if nested.exists():
+            return nested
+        return direct
+
+
+def _resolve_binary(
+    env_var: str | None,
+    binary_name: str,
+) -> tuple[str, ...] | None:
+    """Resolve a binary with fallback to uvx."""
+    if env_var:
+        try:
+            parts = tuple(shlex.split(env_var))
+        except ValueError as e:
+            raise ValueError(
+                f"Invalid shell syntax in environment variable for {binary_name}: {e}"
+            ) from e
+        if not parts:
+            raise ValueError(f"Empty command in environment variable for {binary_name}")
+        return parts
+    which_result = shutil.which(binary_name)
+    if which_result:
+        return (which_result,)
+    if shutil.which("uvx"):
+        if binary_name == "tenzir-node":
+            return ("uvx", "--from", "tenzir", "tenzir-node")
+        return ("uvx", binary_name)
+    return None
+
+
+def discover_settings(
+    *,
+    root: Path | None = None,
+    env: Mapping[str, str] | None = None,
+) -> Settings:
+    """Produce harness settings by combining CLI overrides with environment defaults."""
+
+    environment = dict(os.environ if env is None else env)
+
+    chosen_root = root or environment.get("TENZIR_TEST_ROOT") or Path.cwd()
+    root_path = Path(chosen_root).resolve()
+
+    tenzir_path = _resolve_binary(environment.get("TENZIR_BINARY"), "tenzir")
+    node_path = _resolve_binary(environment.get("TENZIR_NODE_BINARY"), "tenzir-node")
+
+    return Settings(root=root_path, tenzir_binary=tenzir_path, tenzir_node_binary=node_path)

{tenzir_test-0.15.0 → tenzir_test-1.0.0}/src/tenzir_test/engine/state.py

@@ -1,13 +1,12 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import Optional
 
 from ..config import Settings
 from tenzir_test import run
 
-TENZIR_BINARY: Optional[str] = run.TENZIR_BINARY
-TENZIR_NODE_BINARY: Optional[str] = run.TENZIR_NODE_BINARY
+TENZIR_BINARY: tuple[str, ...] | None = run.TENZIR_BINARY
+TENZIR_NODE_BINARY: tuple[str, ...] | None = run.TENZIR_NODE_BINARY
 ROOT: Path = run.ROOT
 INPUTS_DIR: Path = run.INPUTS_DIR
 

{tenzir_test-0.15.0 → tenzir_test-1.0.0}/src/tenzir_test/fixtures/__init__.py

@@ -42,8 +42,8 @@ class FixtureContext:
     coverage: bool
     env: dict[str, str]
     config_args: Sequence[str]
-    tenzir_binary: str | None
-    tenzir_node_binary: str | None
+    tenzir_binary: tuple[str, ...] | None
+    tenzir_node_binary: tuple[str, ...] | None
 
 
 _CONTEXT: ContextVar[FixtureContext | None] = ContextVar(
@@ -57,7 +57,7 @@ class Executor:
     def __init__(self, env: Mapping[str, str] | None = None) -> None:
         source = env or os.environ
         try:
-            self.binary: str = source["TENZIR_NODE_CLIENT_BINARY"]
+            self.binary: tuple[str, ...] = tuple(shlex.split(source["TENZIR_NODE_CLIENT_BINARY"]))
         except KeyError as exc:  # pragma: no cover - defensive guard
             raise RuntimeError("TENZIR_NODE_CLIENT_BINARY is not configured") from exc
         self.endpoint: str | None = source.get("TENZIR_NODE_CLIENT_ENDPOINT")
@@ -72,7 +72,7 @@ class Executor:
         self, source: str, desired_timeout: float | None = None, mirror: bool = False
     ) -> subprocess.CompletedProcess[bytes]:
         cmd = [
-            self.binary,
+            *self.binary,
             "--bare-mode",
             "--console-verbosity=warning",
             "--multi",

{tenzir_test-0.15.0 → tenzir_test-1.0.0}/src/tenzir_test/fixtures/node.py

@@ -165,9 +165,13 @@ def node() -> Iterator[dict[str, str]]:
     if context is None:
         raise RuntimeError("node fixture requires an active test context")
 
-    node_binary = context.tenzir_node_binary or context.env.get("TENZIR_NODE_BINARY")
+    node_binary: tuple[str, ...] | None = context.tenzir_node_binary
     if not node_binary:
-        raise RuntimeError("TENZIR_NODE_BINARY must be configured for the node fixture")
+        raise RuntimeError(
+            "tenzir-node binary not available. The harness checks: "
+            "TENZIR_NODE_BINARY env var, PATH lookup, uvx fallback. "
+            "Ensure tenzir-node is installed, uv is available, or set TENZIR_NODE_BINARY."
+        )
 
     env = context.env.copy()
     # Extract and filter config arguments: we handle --config and --package-dirs separately.
@@ -240,7 +244,7 @@ def node() -> Iterator[dict[str, str]]:
     test_root = context.test.parent
 
     node_cmd = [
-        node_binary,
+        *node_binary,
         "--bare-mode",
         "--console-verbosity=warning",
         f"--state-directory={state_dir}",
@@ -292,9 +296,14 @@ def node() -> Iterator[dict[str, str]]:
             )
             raise RuntimeError(f"failed to obtain endpoint from tenzir-node ({detail})")
 
+        client_binary: str | None = None
+        if context.tenzir_binary:
+            client_binary = shlex.join(context.tenzir_binary)
+        else:
+            client_binary = env.get("TENZIR_BINARY")
         fixture_env = {
             "TENZIR_NODE_CLIENT_ENDPOINT": endpoint,
-            "TENZIR_NODE_CLIENT_BINARY": context.tenzir_binary or env.get("TENZIR_BINARY"),
+            "TENZIR_NODE_CLIENT_BINARY": client_binary,
             "TENZIR_NODE_CLIENT_TIMEOUT": str(context.config["timeout"]),
             "TENZIR_NODE_STATE_DIRECTORY": str(state_dir),
             "TENZIR_NODE_CACHE_DIRECTORY": str(cache_dir),

{tenzir_test-0.15.0 → tenzir_test-1.0.0}/src/tenzir_test/run.py

@@ -176,8 +176,8 @@ def detect_execution_mode(root: Path) -> tuple[ExecutionMode, Path | None]:
 
 
 _settings: Settings | None = None
-TENZIR_BINARY: str | None = None
-TENZIR_NODE_BINARY: str | None = None
+TENZIR_BINARY: tuple[str, ...] | None = None
+TENZIR_NODE_BINARY: tuple[str, ...] | None = None
 ROOT: Path = Path.cwd()
 INPUTS_DIR: Path = ROOT / "inputs"
 EXECUTION_MODE: ExecutionMode = ExecutionMode.PROJECT
@@ -1866,9 +1866,9 @@ def get_test_env_and_config_args(
     if node_config_file.exists():
         env["TENZIR_NODE_CONFIG"] = str(node_config_file)
     if TENZIR_BINARY:
-        env["TENZIR_BINARY"] = TENZIR_BINARY
+        env["TENZIR_BINARY"] = shlex.join(TENZIR_BINARY)
     if TENZIR_NODE_BINARY:
-        env["TENZIR_NODE_BINARY"] = TENZIR_NODE_BINARY
+        env["TENZIR_NODE_BINARY"] = shlex.join(TENZIR_NODE_BINARY)
     env["TENZIR_TEST_ROOT"] = str(ROOT)
     tmp_dir = _create_test_tmp_dir(test)
     env[TEST_TMP_ENV_VAR] = str(tmp_dir)
@@ -2711,7 +2711,7 @@ def get_version() -> str:
     return (
         subprocess.check_output(
             [
-                TENZIR_BINARY,
+                *TENZIR_BINARY,
                 "--bare-mode",
                 "--console-verbosity=warning",
                 "version | select version | write_lines",
@@ -2949,7 +2949,7 @@ def run_simple_test(
             if not TENZIR_BINARY:
                 raise RuntimeError("TENZIR_BINARY must be configured before running tests")
             cmd: list[str] = [
-                TENZIR_BINARY,
+                *TENZIR_BINARY,
                 "--bare-mode",
                 "--console-verbosity=warning",
                 "--multi",
@@ -3359,8 +3359,6 @@ def collect_all_tests(directory: Path) -> Iterator[Path]:
 def run_cli(
     *,
     root: Path | None,
-    tenzir_binary: Path | None,
-    tenzir_node_binary: Path | None,
     package_dirs: Sequence[Path] | None = None,
     tests: Sequence[Path],
     update: bool,
@@ -3448,11 +3446,7 @@ def run_cli(
             print(f"{INFO} ignoring --update in passthrough mode")
             update = False
 
-        settings = discover_settings(
-            root=root,
-            tenzir_binary=tenzir_binary,
-            tenzir_node_binary=tenzir_node_binary,
-        )
+        settings = discover_settings(root=root)
         apply_settings(settings)
         _set_cli_packages(list(package_dirs or []))
         selected_tests = list(tests)
@@ -3796,8 +3790,6 @@ def run_cli(
 def execute(
     *,
     root: Path | None = None,
-    tenzir_binary: Path | None = None,
-    tenzir_node_binary: Path | None = None,
     tests: Sequence[Path] = (),
     update: bool = False,
     debug: bool = False,
@@ -3825,8 +3817,6 @@ def execute(
     resolved_jobs = jobs if jobs is not None else get_default_jobs()
     return run_cli(
         root=root,
-        tenzir_binary=tenzir_binary,
-        tenzir_node_binary=tenzir_node_binary,
         tests=list(tests),
         update=update,
         debug=debug,

{tenzir_test-0.15.0 → tenzir_test-1.0.0}/src/tenzir_test/runners/custom_python_fixture_runner.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import json
 import os
+import shlex
 import subprocess
 import sys
 import typing
@@ -99,9 +100,9 @@ class CustomPythonFixture(ExtRunner):
                         endpoint = None
                     new_pythonpath = os.pathsep.join(pythonpath_entries)
                     env["PYTHONPATH"] = new_pythonpath
-                    env["TENZIR_NODE_CLIENT_BINARY"] = binary
+                    env["TENZIR_NODE_CLIENT_BINARY"] = shlex.join(binary)
                     env["TENZIR_NODE_CLIENT_TIMEOUT"] = str(timeout)
-                    env.setdefault("TENZIR_PYTHON_FIXTURE_BINARY", binary)
+                    env.setdefault("TENZIR_PYTHON_FIXTURE_BINARY", shlex.join(binary))
                     env["TENZIR_PYTHON_FIXTURE_TIMEOUT"] = str(timeout)
                     if node_requested and endpoint:
                         env["TENZIR_PYTHON_FIXTURE_ENDPOINT"] = endpoint

tenzir_test-1.0.0/tests/test_config.py

@@ -0,0 +1,106 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+import pytest
+
+from tenzir_test import config
+
+
+def test_discover_settings_defaults(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
+    monkeypatch.chdir(tmp_path)
+    monkeypatch.setattr(config.shutil, "which", lambda name: f"/tmp/{name}")
+
+    settings = config.discover_settings(env={})
+
+    assert settings.root == tmp_path.resolve()
+    assert settings.inputs_dir == tmp_path / "inputs"
+    assert settings.tenzir_binary == ("/tmp/tenzir",)
+    assert settings.tenzir_node_binary == ("/tmp/tenzir-node",)
+
+
+def test_discover_settings_env_overrides(tmp_path: Path) -> None:
+    env = {
+        "TENZIR_TEST_ROOT": str(tmp_path / "suite"),
+        "TENZIR_BINARY": "/custom/tenzir",
+        "TENZIR_NODE_BINARY": "/custom/tenzir-node",
+    }
+
+    settings = config.discover_settings(env=env)
+
+    assert settings.root == (tmp_path / "suite").resolve()
+    assert settings.tenzir_binary == ("/custom/tenzir",)
+    assert settings.tenzir_node_binary == ("/custom/tenzir-node",)
+
+
+def test_discover_settings_env_multipart(tmp_path: Path) -> None:
+    """Environment variables can specify multi-part commands like 'uvx tenzir'."""
+    env = {
+        "TENZIR_TEST_ROOT": str(tmp_path / "suite"),
+        "TENZIR_BINARY": "uvx tenzir",
+        "TENZIR_NODE_BINARY": "uvx tenzir-node",
+    }
+
+    settings = config.discover_settings(env=env)
+
+    assert settings.tenzir_binary == ("uvx", "tenzir")
+    assert settings.tenzir_node_binary == ("uvx", "tenzir-node")
+
+
+def test_discover_settings_uvx_fallback(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
+    """When tenzir is not found but uvx is available, fall back to uvx."""
+    monkeypatch.chdir(tmp_path)
+
+    def mock_which(name: str) -> str | None:
+        if name == "uvx":
+            return "/usr/local/bin/uvx"
+        return None
+
+    monkeypatch.setattr(config.shutil, "which", mock_which)
+
+    settings = config.discover_settings(env={})
+
+    assert settings.tenzir_binary == ("uvx", "tenzir")
+    assert settings.tenzir_node_binary == ("uvx", "--from", "tenzir", "tenzir-node")
+
+
+def test_discover_settings_no_binary(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> None:
+    """When no binary is found and uvx is unavailable, return None."""
+    monkeypatch.chdir(tmp_path)
+    monkeypatch.setattr(config.shutil, "which", lambda name: None)
+
+    settings = config.discover_settings(env={})
+
+    assert settings.tenzir_binary is None
+    assert settings.tenzir_node_binary is None
+
+
+def test_settings_inputs_dir_nested(tmp_path: Path) -> None:
+    nested = tmp_path / "tests" / "inputs"
+    nested.mkdir(parents=True)
+
+    settings = config.discover_settings(root=tmp_path)
+
+    assert settings.inputs_dir == nested
+
+
+def test_discover_settings_malformed_binary(tmp_path: Path) -> None:
+    """Malformed shell syntax in binary env var raises ValueError."""
+    env = {
+        "TENZIR_TEST_ROOT": str(tmp_path),
+        "TENZIR_BINARY": "unclosed 'quote",
+    }
+
+    with pytest.raises(ValueError, match="Invalid shell syntax"):
+        config.discover_settings(env=env)
+
+
+def test_discover_settings_empty_binary(tmp_path: Path) -> None:
+    """Empty string after parsing raises ValueError."""
+    env = {
+        "TENZIR_TEST_ROOT": str(tmp_path),
+        "TENZIR_BINARY": "   ",  # Whitespace-only parses to empty
+    }
+
+    with pytest.raises(ValueError, match="Empty command"):
+        config.discover_settings(env=env)

{tenzir_test-0.15.0 → tenzir_test-1.0.0}/tests/test_python_runner.py

@@ -21,7 +21,7 @@ def python_fixture_root(tmp_path: Path) -> Path:
     )
     test_settings = config.Settings(
         root=tmp_path,
-        tenzir_binary=run.TENZIR_BINARY or "/usr/bin/tenzir",
+        tenzir_binary=run.TENZIR_BINARY or ("/usr/bin/tenzir",),
         tenzir_node_binary=run.TENZIR_NODE_BINARY,
     )
     run.apply_settings(test_settings)
@@ -267,7 +267,7 @@ def test_executor_from_env() -> None:
         "TENZIR_NODE_CLIENT_TIMEOUT": "5",
     }
     executor = fixtures.Executor.from_env(env)
-    assert executor.binary == "/usr/bin/tenzir-node"
+    assert executor.binary == ("/usr/bin/tenzir-node",)
     assert executor.endpoint == "localhost:0"
 
 

{tenzir_test-0.15.0 → tenzir_test-1.0.0}/tests/test_run.py

@@ -520,8 +520,8 @@ def test_node_fixture_uses_explicit_node_config(tmp_path, monkeypatch):
         coverage=False,
         env=env,
         config_args=("--config=/default/tenzir.yaml", "--package-dirs=/pkg"),
-        tenzir_binary="/usr/bin/tenzir",
-        tenzir_node_binary="/usr/bin/tenzir-node",
+        tenzir_binary=("/usr/bin/tenzir",),
+        tenzir_node_binary=("/usr/bin/tenzir-node",),
     )
 
     token = fixture_api.push_context(context)
@@ -571,8 +571,8 @@ def test_node_fixture_skips_config_when_unset(monkeypatch):
         coverage=False,
         env=env,
         config_args=("--config=/default/tenzir.yaml", "--package-dirs=/pkg"),
-        tenzir_binary="/usr/bin/tenzir",
-        tenzir_node_binary="/usr/bin/tenzir-node",
+        tenzir_binary=("/usr/bin/tenzir",),
+        tenzir_node_binary=("/usr/bin/tenzir-node",),
     )
 
     token = fixture_api.push_context(context)
@@ -620,8 +620,8 @@ def test_node_fixture_adds_package_dirs_from_env(monkeypatch):
         coverage=False,
         env=env,
         config_args=("--config=/default/tenzir.yaml",),
-        tenzir_binary="/usr/bin/tenzir",
-        tenzir_node_binary="/usr/bin/tenzir-node",
+        tenzir_binary=("/usr/bin/tenzir",),
+        tenzir_node_binary=("/usr/bin/tenzir-node",),
     )
 
     token = fixture_api.push_context(context)
@@ -676,8 +676,8 @@ def test_node_fixture_deduplicates_package_dirs(monkeypatch):
         coverage=False,
         env=env,
         config_args=("--package-dirs=/pkg,/other",),
-        tenzir_binary="/usr/bin/tenzir",
-        tenzir_node_binary="/usr/bin/tenzir-node",
+        tenzir_binary=("/usr/bin/tenzir",),
+        tenzir_node_binary=("/usr/bin/tenzir-node",),
     )
 
     token = fixture_api.push_context(context)
@@ -709,8 +709,8 @@ def test_node_fixture_in_suite_receives_package_dirs(monkeypatch: pytest.MonkeyP
     run.apply_settings(
         config.Settings(
             root=package_root,
-            tenzir_binary="tenzir",
-            tenzir_node_binary="tenzir-node",
+            tenzir_binary=("tenzir",),
+            tenzir_node_binary=("tenzir-node",),
         )
     )
     run._clear_directory_config_cache()
@@ -934,8 +934,6 @@ def test_cli_rejects_partial_suite_selection(
         with pytest.raises(run.HarnessError) as exc_info:
             run.run_cli(
                 root=project_root,
-                tenzir_binary=None,
-                tenzir_node_binary=None,
                 tests=[test_file],
                 update=False,
                 debug=False,
@@ -961,8 +959,6 @@ def test_cli_rejects_partial_suite_selection(
         with pytest.raises(run.HarnessError) as exc_info:
             run.run_cli(
                 root=project_root,
-                tenzir_binary=None,
-                tenzir_node_binary=None,
                 tests=[suite_subdir],
                 update=False,
                 debug=False,

{tenzir_test-0.15.0 → tenzir_test-1.0.0}/tests/test_run_config.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from pathlib import Path
+import shlex
 import shutil
 import sys
 
@@ -206,9 +207,9 @@ def test_get_test_env_and_config_args(configured_root: Path) -> None:
     assert env_override["TENZIR_INPUTS"] == str(custom_inputs.resolve())
     assert args_override == [f"--config={config_file}"]
     if run.TENZIR_BINARY:
-        assert env["TENZIR_BINARY"] == run.TENZIR_BINARY
+        assert env["TENZIR_BINARY"] == shlex.join(run.TENZIR_BINARY)
     if run.TENZIR_NODE_BINARY:
-        assert env["TENZIR_NODE_BINARY"] == run.TENZIR_NODE_BINARY
+        assert env["TENZIR_NODE_BINARY"] == shlex.join(run.TENZIR_NODE_BINARY)
     assert "TENZIR_NODE_CONFIG" not in env
     assert args == [f"--config={config_file}"]
 
@@ -508,7 +509,7 @@ def test_run_simple_test_injects_package_dirs(
     run.apply_settings(
         config.Settings(
             root=package_root,
-            tenzir_binary=sys.executable,
+            tenzir_binary=(sys.executable,),
             tenzir_node_binary=None,
         )
     )
@@ -559,7 +560,7 @@ def test_run_simple_test_merges_package_dirs_from_directory_config(
     run.apply_settings(
         config.Settings(
             root=package_root,
-            tenzir_binary=sys.executable,
+            tenzir_binary=(sys.executable,),
             tenzir_node_binary=None,
         )
     )
@@ -621,7 +622,7 @@ def test_run_simple_test_respects_inputs_override(
     run.apply_settings(
         config.Settings(
             root=package_root,
-            tenzir_binary=sys.executable,
+            tenzir_binary=(sys.executable,),
             tenzir_node_binary=None,
         )
     )
@@ -672,7 +673,7 @@ def test_run_simple_test_passthrough_streams_output(
     run.apply_settings(
         config.Settings(
             root=tmp_path,
-            tenzir_binary=sys.executable,
+            tenzir_binary=(sys.executable,),
             tenzir_node_binary=None,
         )
     )
@@ -718,7 +719,7 @@ def test_run_simple_test_reports_stderr_on_failure(
     run.apply_settings(
         config.Settings(
             root=tmp_path,
-            tenzir_binary=sys.executable,
+            tenzir_binary=(sys.executable,),
             tenzir_node_binary=None,
         )
     )
@@ -762,7 +763,7 @@ def test_run_simple_test_suppresses_diff_on_interrupt(
     run.apply_settings(
         config.Settings(
             root=tmp_path,
-            tenzir_binary=sys.executable,
+            tenzir_binary=(sys.executable,),
             tenzir_node_binary=None,
         )
     )