tenzir-test 0.15.0__py3-none-any.whl → 1.0.1__py3-none-any.whl

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/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/config.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import os
+import shlex
 import shutil
 from dataclasses import dataclass
 from pathlib import Path
@@ -12,8 +13,8 @@ class Settings:
     """Configuration values steering how the harness discovers binaries and data."""
 
     root: Path
-    tenzir_binary: str | None
-    tenzir_node_binary: str | None
+    tenzir_binary: tuple[str, ...] | None
+    tenzir_node_binary: tuple[str, ...] | None
 
     @property
     def inputs_dir(self) -> Path:
@@ -26,17 +27,34 @@ class Settings:
         return direct
 
 
-def _coerce_binary(value: str | os.PathLike[str] | None) -> str | None:
-    if value is None:
-        return None
-    return str(value)
+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,
-    tenzir_binary: str | os.PathLike[str] | None = None,
-    tenzir_node_binary: str | os.PathLike[str] | None = None,
     env: Mapping[str, str] | None = None,
 ) -> Settings:
     """Produce harness settings by combining CLI overrides with environment defaults."""
@@ -46,12 +64,7 @@ def discover_settings(
     chosen_root = root or environment.get("TENZIR_TEST_ROOT") or Path.cwd()
     root_path = Path(chosen_root).resolve()
 
-    binary_cli = _coerce_binary(tenzir_binary)
-    binary_env = environment.get("TENZIR_BINARY")
-    tenzir_path = binary_cli or binary_env or shutil.which("tenzir")
-
-    node_cli = _coerce_binary(tenzir_node_binary)
-    node_env = environment.get("TENZIR_NODE_BINARY")
-    node_path = node_cli or node_env or shutil.which("tenzir-node")
+    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/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/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/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/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/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/runners/diff_runner.py

@@ -66,7 +66,7 @@ class DiffRunner(TqlRunner):
                 binary = run_mod.TENZIR_BINARY
                 if not binary:
                     raise RuntimeError("TENZIR_BINARY must be configured for diff runners")
-                base_cmd: list[str] = [binary, *config_args]
+                base_cmd: list[str] = [*binary, *config_args]
 
                 if coverage:
                     coverage_dir = env.get(

{tenzir_test-0.15.0.dist-info → tenzir_test-1.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tenzir-test
-Version: 0.15.0
+Version: 1.0.1
 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-0.15.0.dist-info → tenzir_test-1.0.1.dist-info}/RECORD

@@ -1,28 +1,28 @@
 tenzir_test/__init__.py,sha256=k7V6Pbjaa8SAy6t4KnaauHTyfnyVEwc1VGtH823MANU,1181
-tenzir_test/_python_runner.py,sha256=LmghMIolsNEC2wUyJdv1h_cefOxTxET1IACrw-_hHuY,2900
-tenzir_test/cli.py,sha256=e93O5dyp6oeiuW3Im11wWyuOc6duKTwUJmcmFuoVnoE,6803
-tenzir_test/config.py,sha256=bVuMJlEvevZxCmvzTJ4bs4SkYLNGZtxcCDYhtC-0sp8,1697
+tenzir_test/_python_runner.py,sha256=ZODuZ6ll21gxBRj34iq-7lOmZOiqzFyu7wnPnS0K648,3130
+tenzir_test/cli.py,sha256=WwddXpkjg3OIT5E54LOobaibDkGH9UvTLzZ9iMKw-qQ,6241
+tenzir_test/config.py,sha256=z4ayS62SfOLNwrEgNktVeulyQ2QW4KUlN1KX0Za1NDM,2110
 tenzir_test/packages.py,sha256=cTCQdGjCS1XmuKyiwh0ew-z9tHn6J-xZ6nvBP-hU8bc,948
 tenzir_test/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tenzir_test/run.py,sha256=OmW-qaWK6Y9vCAWZmnMczz-ycaleMa9jmiPcATpCoL8,133280
+tenzir_test/run.py,sha256=cWCvK4N4fKnFnJe8QBZ9OPDgc9mFIzaNhuduG1L1Mzs,132979
 tenzir_test/engine/__init__.py,sha256=5APwy90YDm7rmL_qCZfToAcfbQthcZ8yV2_ExXKqaqE,110
 tenzir_test/engine/operations.py,sha256=OCYjuMHyMAaay4s08u2Sl7oE-PmgeXumylp7R8GYIH4,950
 tenzir_test/engine/registry.py,sha256=LXCr6TGlv1sR1m1eboTk7SrbS2IVErc3PqUuHxGA2xk,594
-tenzir_test/engine/state.py,sha256=Ez-Q27dL5oNqiJE0A4P2OP0p6i7aYKzH4ZyVWNgEezs,889
+tenzir_test/engine/state.py,sha256=zolKmUWpTEajoq4gY8KYv_puCeS_DOpOTExBwLulNjo,879
 tenzir_test/engine/worker.py,sha256=WwIkx1m_ANNveQjNisy5-qpbUZl_DfDXxVIfdxABKjc,140
-tenzir_test/fixtures/__init__.py,sha256=PdkN334btlqagY-4wAwsCyfhHE8kd_RLNoVM_ULii_I,18384
-tenzir_test/fixtures/node.py,sha256=Y3YqWeqYz-mg3B5V0wIthk55zVOd4JS37zlTdHzlA6c,11193
+tenzir_test/fixtures/__init__.py,sha256=H8deAoYg7HMPsZZ2UTO2KE1N82CbCQqN0bXk8q7B9ww,18441
+tenzir_test/fixtures/node.py,sha256=iNT3H0y_9g-CzJO7-EPrAYBOX69O-g3lnuQiAvGqThc,11524
 tenzir_test/runners/__init__.py,sha256=M3p-TsDp231Dy58miDb467bA1kLYzgpa0pqVr_KP1ro,4616
 tenzir_test/runners/_utils.py,sha256=BWv7UEPGa01l4tGTCg5i_22NblIyRw8vjk_5NIf1x_c,467
-tenzir_test/runners/custom_python_fixture_runner.py,sha256=uXbSf18xTttf51k2EbjWf8AqN2R7TfpfSCkLyU5HJx4,7284
-tenzir_test/runners/diff_runner.py,sha256=WIEry_-4R4VIlA9HON5kl2ipyy1TKzS4jRc2wPl6r5c,5476
+tenzir_test/runners/custom_python_fixture_runner.py,sha256=kJ4NYfLnB2ntZguv1pzIge_ith7D49YHKM35CJXU8MA,7321
+tenzir_test/runners/diff_runner.py,sha256=zRLeoqwqLdIpP5weq20K0VQdIXPy7QFmZ462Hlg0L0k,5477
 tenzir_test/runners/ext_runner.py,sha256=sKL9Mw_ksVVBWnrdIJR2WS5ueVnLKuNYYWZ22FTZIPo,730
 tenzir_test/runners/runner.py,sha256=LtlD8huQOSmD7RyYDnKeCuI4Y6vhxGXMKsHA2qgfWN0,989
 tenzir_test/runners/shell_runner.py,sha256=OuofgHeZN2FaO6xRI3uyqstLBymc6rmWC4HAnSn91AE,6068
 tenzir_test/runners/tenzir_runner.py,sha256=464FFYS_mh6l-ehccc-S8cIUO1MxdapwQL5X3PmMkMI,1006
 tenzir_test/runners/tql_runner.py,sha256=2ZLMf3TIKwcOvaOFrVvvhzK-EcWmGOUZxKkbSoByyQA,248
-tenzir_test-0.15.0.dist-info/METADATA,sha256=MWDDBuFmf5BU8h1kBsj591GmYUPgv58-IZ357_iu0n8,3066
-tenzir_test-0.15.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-tenzir_test-0.15.0.dist-info/entry_points.txt,sha256=l8DJgiEVrjScdTTo613cZ3PKodOmqrUVIbz-3awfV8w,53
-tenzir_test-0.15.0.dist-info/licenses/LICENSE,sha256=ajMbpcBiSTXI8Rr4t17pvowV-On8DktghfZKxY_A22Q,10750
-tenzir_test-0.15.0.dist-info/RECORD,,
+tenzir_test-1.0.1.dist-info/METADATA,sha256=VxkVLX0mwLhiKxMPIAagcRdb6EssgTeCLQ_EGK5MpiA,3065
+tenzir_test-1.0.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+tenzir_test-1.0.1.dist-info/entry_points.txt,sha256=l8DJgiEVrjScdTTo613cZ3PKodOmqrUVIbz-3awfV8w,53
+tenzir_test-1.0.1.dist-info/licenses/LICENSE,sha256=ajMbpcBiSTXI8Rr4t17pvowV-On8DktghfZKxY_A22Q,10750
+tenzir_test-1.0.1.dist-info/RECORD,,