tenzir-test 0.13.1__py3-none-any.whl → 0.14.0__py3-none-any.whl

tenzir_test/run.py

@@ -1641,20 +1641,12 @@ def _iter_project_test_directories(root: Path) -> Iterator[Path]:
 
 
 def _is_inputs_path(path: Path) -> bool:
-    """Return True when the path lives under an inputs directory."""
+    """Return True when the path lives under any inputs directory."""
     try:
         parts = path.relative_to(ROOT).parts
     except ValueError:
         parts = path.parts
-
-    for index, part in enumerate(parts):
-        if part != "inputs":
-            continue
-        if index == 0:
-            return True
-        if index > 0 and parts[index - 1] == "tests":
-            return True
-    return False
+    return "inputs" in parts
 
 
 def _refresh_registry() -> None:
@@ -1687,6 +1679,25 @@ def _resolve_inputs_dir(root: Path) -> Path:
     return direct
 
 
+def _find_nearest_inputs_dir(test: Path, root: Path) -> Path | None:
+    """Walk up from test directory to find nearest inputs/ directory.
+
+    Returns the nearest inputs/ directory between the test and root,
+    or None if no inputs/ directory exists in that range.
+    """
+    current = test.parent
+    root_resolved = root.resolve()
+    while True:
+        candidate = current / "inputs"
+        if candidate.is_dir():
+            return candidate
+        # Stop when we reach or pass the root
+        if current.resolve() == root_resolved or current == current.parent:
+            break
+        current = current.parent
+    return None
+
+
 def _looks_like_project_root(path: Path) -> bool:
     """Return True when the path or one of its parents resembles a project root."""
 
@@ -1818,13 +1829,22 @@ def get_test_env_and_config_args(
     config_args = [f"--config={config_file}"] if config_file.exists() else []
     env = os.environ.copy()
     if inputs is None:
-        inputs_path = str(_resolve_inputs_dir(ROOT).resolve())
+        # Try nearest inputs/ directory first, fall back to project-level
+        nearest = _find_nearest_inputs_dir(test, ROOT)
+        if nearest is not None:
+            inputs_path = str(nearest.resolve())
+        else:
+            inputs_path = str(_resolve_inputs_dir(ROOT).resolve())
     else:
         candidate = Path(os.fspath(inputs))
         if not candidate.is_absolute():
             candidate = test.parent / candidate
         inputs_path = str(candidate.resolve())
     env["TENZIR_INPUTS"] = inputs_path
+    # Check for inline input file (.input extension)
+    inline_input = test.with_suffix(".input")
+    if inline_input.is_file():
+        env["TENZIR_INPUT"] = str(inline_input.resolve())
     if config_file.exists():
         env.setdefault("TENZIR_CONFIG", str(config_file))
     if node_config_file.exists():
@@ -2853,7 +2873,12 @@ def run_simple_test(
         env["TENZIR_PACKAGE_ROOT"] = str(package_root)
         package_tests_root = package_root / "tests"
         if inputs_override is None:
-            env["TENZIR_INPUTS"] = str(package_tests_root / "inputs")
+            # Try nearest inputs/ directory, fall back to package-level
+            nearest = _find_nearest_inputs_dir(test, package_root)
+            if nearest is not None:
+                env["TENZIR_INPUTS"] = str(nearest.resolve())
+            else:
+                env["TENZIR_INPUTS"] = str(package_tests_root / "inputs")
         package_dir_candidates.append(str(package_root))
     package_dir_candidates.extend(additional_package_dirs)
     for cli_path in _get_cli_packages():
@@ -3128,7 +3153,12 @@ class Worker:
         if package_root is not None:
             env["TENZIR_PACKAGE_ROOT"] = str(package_root)
             if inputs_override is None:
-                env["TENZIR_INPUTS"] = str((package_root / "tests" / "inputs"))
+                # Try nearest inputs/ directory, fall back to package-level
+                nearest = _find_nearest_inputs_dir(primary_test, package_root)
+                if nearest is not None:
+                    env["TENZIR_INPUTS"] = str(nearest.resolve())
+                else:
+                    env["TENZIR_INPUTS"] = str((package_root / "tests" / "inputs"))
             package_dir_candidates.append(str(package_root))
         package_dir_candidates.extend(additional_package_dirs)
         for cli_path in _get_cli_packages():

{tenzir_test-0.13.1.dist-info → tenzir_test-0.14.0.dist-info}/METADATA

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

@@ -4,7 +4,7 @@ tenzir_test/cli.py,sha256=JJNCaF-vZSql6kvPGG4JwO9Z8XIwQWe_5bKuBiuGjLE,6553
 tenzir_test/config.py,sha256=bVuMJlEvevZxCmvzTJ4bs4SkYLNGZtxcCDYhtC-0sp8,1697
 tenzir_test/packages.py,sha256=cTCQdGjCS1XmuKyiwh0ew-z9tHn6J-xZ6nvBP-hU8bc,948
 tenzir_test/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tenzir_test/run.py,sha256=3uq2r3hqa-COrK3f-8UAO4jtD1i5-FgPn5UadspNfqA,130445
+tenzir_test/run.py,sha256=1DcxoN0r6fYlAQAHH8xe4zOPPUeo3IW89xffazUkJbs,131845
 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
@@ -21,8 +21,8 @@ tenzir_test/runners/runner.py,sha256=LtlD8huQOSmD7RyYDnKeCuI4Y6vhxGXMKsHA2qgfWN0
 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.13.1.dist-info/METADATA,sha256=WB95n9cgGgb6T9SraMuXw3ymn3ujtM5qEIg3zm3fTXo,3066
-tenzir_test-0.13.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-tenzir_test-0.13.1.dist-info/entry_points.txt,sha256=l8DJgiEVrjScdTTo613cZ3PKodOmqrUVIbz-3awfV8w,53
-tenzir_test-0.13.1.dist-info/licenses/LICENSE,sha256=ajMbpcBiSTXI8Rr4t17pvowV-On8DktghfZKxY_A22Q,10750
-tenzir_test-0.13.1.dist-info/RECORD,,
+tenzir_test-0.14.0.dist-info/METADATA,sha256=EJ_Mx0170X9a9qvzeCdtt7sRwoYmBF26vor7NJWYUgE,3066
+tenzir_test-0.14.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+tenzir_test-0.14.0.dist-info/entry_points.txt,sha256=l8DJgiEVrjScdTTo613cZ3PKodOmqrUVIbz-3awfV8w,53
+tenzir_test-0.14.0.dist-info/licenses/LICENSE,sha256=ajMbpcBiSTXI8Rr4t17pvowV-On8DktghfZKxY_A22Q,10750
+tenzir_test-0.14.0.dist-info/RECORD,,