tenzir-test 0.9.3__py3-none-any.whl → 0.9.5__py3-none-any.whl

tenzir_test/cli.py

@@ -90,6 +90,18 @@ def _normalize_exit_code(value: object) -> int:
     is_flag=True,
     help="Show an aggregate table and detailed failure summary after execution.",
 )
+@click.option(
+    "--diff/--no-diff",
+    "show_diff_output",
+    default=True,
+    help="Show unified diffs when expectations differ.",
+)
+@click.option(
+    "--diff-stat/--no-diff-stat",
+    "show_diff_stat",
+    default=True,
+    help="Include per-file diff statistics and change counters when expectations differ.",
+)
 @click.option(
     "-k",
     "--keep",
@@ -134,6 +146,8 @@ def cli(
     runner_summary: bool,
     fixture_summary: bool,
     show_summary: bool,
+    show_diff_output: bool,
+    show_diff_stat: bool,
     keep_tmp_dirs: bool,
     jobs: int,
     passthrough: bool,
@@ -157,6 +171,8 @@ def cli(
         runner_summary=runner_summary,
         fixture_summary=fixture_summary,
         show_summary=show_summary,
+        show_diff_output=show_diff_output,
+        show_diff_stat=show_diff_stat,
         keep_tmp_dirs=keep_tmp_dirs,
         jobs=jobs,
         passthrough=passthrough,

tenzir_test/run.py

@@ -349,8 +349,33 @@ _TMP_ROOT_NAME = ".tenzir-test"
 _TMP_SUBDIR_NAME = "tmp"
 _TMP_BASE_DIRS: set[Path] = set()
 _ACTIVE_TMP_DIRS: set[Path] = set()
+_TMP_DIR_LOCK = threading.Lock()
 KEEP_TMP_DIRS = bool(os.environ.get(_TMP_KEEP_ENV_VAR))
 
+SHOW_DIFF_OUTPUT = True
+SHOW_DIFF_STAT = True
+_BLOCK_INDENT = ""
+_PLUS_SYMBOLS = {1: "□", 10: "▣", 100: "■"}
+_MINUS_SYMBOLS = {1: "□", 10: "▣", 100: "■"}
+
+
+def set_show_diff_output(enabled: bool) -> None:
+    global SHOW_DIFF_OUTPUT
+    SHOW_DIFF_OUTPUT = enabled
+
+
+def should_show_diff_output() -> bool:
+    return SHOW_DIFF_OUTPUT
+
+
+def set_show_diff_stat(enabled: bool) -> None:
+    global SHOW_DIFF_STAT
+    SHOW_DIFF_STAT = enabled
+
+
+def should_show_diff_stat() -> bool:
+    return SHOW_DIFF_STAT
+
 
 def set_harness_mode(mode: HarnessMode) -> None:
     """Set the global harness execution mode."""
@@ -482,10 +507,13 @@ def _tmp_prefix_for(test: Path) -> str:
 
 
 def _create_test_tmp_dir(test: Path) -> Path:
-    base = _resolve_tmp_base()
     prefix = f"{_tmp_prefix_for(test)}-"
-    path = Path(tempfile.mkdtemp(prefix=prefix, dir=str(base)))
-    _ACTIVE_TMP_DIRS.add(path)
+    with _TMP_DIR_LOCK:
+        base = _resolve_tmp_base()
+        if not base.exists():
+            base.mkdir(parents=True, exist_ok=True)
+        path = Path(tempfile.mkdtemp(prefix=prefix, dir=str(base)))
+        _ACTIVE_TMP_DIRS.add(path)
     return path
 
 
@@ -498,22 +526,27 @@ def cleanup_test_tmp_dir(path: str | os.PathLike[str] | None) -> None:
     if not path:
         return
     tmp_path = Path(path)
-    _ACTIVE_TMP_DIRS.discard(tmp_path)
+    with _TMP_DIR_LOCK:
+        _ACTIVE_TMP_DIRS.discard(tmp_path)
     try:
         fixtures_impl.invoke_tmp_dir_cleanup(tmp_path)
     except Exception:  # pragma: no cover - defensive logging
         pass
     if KEEP_TMP_DIRS:
         return
-    if tmp_path.exists():
-        shutil.rmtree(tmp_path, ignore_errors=True)
-    _cleanup_tmp_base_dirs()
+    with _TMP_DIR_LOCK:
+        if tmp_path.exists():
+            shutil.rmtree(tmp_path, ignore_errors=True)
+        _cleanup_tmp_base_dirs()
 
 
 def _cleanup_remaining_tmp_dirs() -> None:
-    for tmp_path in list(_ACTIVE_TMP_DIRS):
+    with _TMP_DIR_LOCK:
+        remaining = list(_ACTIVE_TMP_DIRS)
+    for tmp_path in remaining:
         cleanup_test_tmp_dir(tmp_path)
-    _cleanup_tmp_base_dirs()
+    with _TMP_DIR_LOCK:
+        _cleanup_tmp_base_dirs()
 
 
 def _cleanup_all_tmp_dirs() -> None:
@@ -521,9 +554,12 @@ def _cleanup_all_tmp_dirs() -> None:
 
     if KEEP_TMP_DIRS:
         return
-    for tmp_path in list(_ACTIVE_TMP_DIRS):
+    with _TMP_DIR_LOCK:
+        remaining = list(_ACTIVE_TMP_DIRS)
+    for tmp_path in remaining:
         cleanup_test_tmp_dir(tmp_path)
-    _cleanup_tmp_base_dirs()
+    with _TMP_DIR_LOCK:
+        _cleanup_tmp_base_dirs()
 
 
 def _cleanup_tmp_base_dirs() -> None:
@@ -2015,10 +2051,9 @@ def _summarize_harness_configuration(
     runner_summary: bool,
     fixture_summary: bool,
     passthrough: bool,
-) -> tuple[int, str]:
+) -> tuple[int, str, str]:
     enabled_flags: list[str] = []
     toggles = (
-        ("update", update),
         ("coverage", coverage),
         ("debug", debug),
         ("summary", show_summary),
@@ -2029,9 +2064,13 @@ def _summarize_harness_configuration(
     for name, flag in toggles:
         if flag:
             enabled_flags.append(name)
-    if passthrough:
-        enabled_flags.append("passthrough")
-    return jobs, ", ".join(enabled_flags)
+    if update:
+        verb = "updating"
+    elif passthrough:
+        verb = "showing"
+    else:
+        verb = "running"
+    return jobs, ", ".join(enabled_flags), verb
 
 
 def _relativize_path(path: Path) -> Path:
@@ -2395,7 +2434,46 @@ def last_and(items: Iterable[T]) -> Iterator[tuple[bool, T]]:
     for item in iterator:
         yield (False, previous)
         previous = item
-    yield (True, previous)
+
+
+def _format_unary_symbols(count: int, symbols: dict[int, str]) -> str:
+    if count <= 0:
+        return ""
+    hundreds, remainder = divmod(count, 100)
+    tens, ones = divmod(remainder, 10)
+    parts: list[str] = []
+    if hundreds:
+        parts.append(symbols[100] * hundreds)
+    if tens:
+        parts.append(symbols[10] * tens)
+    if ones:
+        parts.append(symbols[1] * ones)
+    return "".join(parts)
+
+
+def _format_diff_counter(added: int, removed: int) -> str:
+    plus_segment = _format_unary_symbols(added, _PLUS_SYMBOLS)
+    minus_segment = _format_unary_symbols(removed, _MINUS_SYMBOLS)
+    colored_plus = f"\033[32m{plus_segment}\033[0m" if plus_segment else ""
+    colored_minus = f"\033[31m{minus_segment}\033[0m" if minus_segment else ""
+    return f"{colored_plus}{colored_minus}"
+
+
+def _format_stat_header(path: os.PathLike[str] | str, added: int, removed: int) -> str:
+    path_str = os.fspath(path)
+    counter = _format_diff_counter(added, removed)
+    plus_count = f"\033[32m{added}(+)\033[0m"
+    minus_count = f"\033[31m{removed}(-)\033[0m"
+    if counter:
+        counter_segment = f" {counter}"
+    else:
+        counter_segment = ""
+    return f"{_BLOCK_INDENT}┌ {path_str} {plus_count}/{minus_count}{counter_segment}"
+
+
+def _format_lines_changed(total: int) -> str:
+    line = "line" if total == 1 else "lines"
+    return f"{_BLOCK_INDENT}└ {total} {line} changed"
 
 
 def print_diff(expected: bytes, actual: bytes, path: Path) -> None:
@@ -2409,22 +2487,51 @@ def print_diff(expected: bytes, actual: bytes, path: Path) -> None:
             n=2,
         )
     )
-    with stdout_lock:
-        rel_path = _relativize_path(path)
+    added = sum(
+        1
+        for index, line in enumerate(diff)
+        if index >= 2 and line.startswith(b"+") and not line.startswith(b"+++")
+    )
+    removed = sum(
+        1
+        for index, line in enumerate(diff)
+        if index >= 2 and line.startswith(b"-") and not line.startswith(b"---")
+    )
+    show_stat = should_show_diff_stat()
+    show_diff = should_show_diff_output()
+    diff_lines: list[str] = []
+    if should_show_diff_output():
         skip = 2
-        for i, line in enumerate(diff):
+        for raw_line in diff:
             if skip > 0:
                 skip -= 1
                 continue
-            if line.startswith(b"@@"):
-                print(f"┌─▶ \033[31m{rel_path}\033[0m")
-                continue
-            if line.startswith(b"+"):
-                line = b"\033[92m" + line + b"\033[0m"
-            elif line.startswith(b"-"):
-                line = b"\033[31m" + line + b"\033[0m"
-            prefix = ("│ " if i != len(diff) - 1 else "└─").encode()
-            sys.stdout.buffer.write(prefix + line)
+            text = raw_line.decode("utf-8", "replace").rstrip("\r\n")
+            if raw_line.startswith(b"+") and not raw_line.startswith(b"+++"):
+                text = f"\033[32m{text}\033[0m"
+            elif raw_line.startswith(b"-") and not raw_line.startswith(b"---"):
+                text = f"\033[31m{text}\033[0m"
+            diff_lines.append(text)
+    rel_path = _relativize_path(path)
+    rel_path_str = os.fspath(rel_path)
+    lines: list[str] = []
+    total_changed = added + removed
+    if not show_stat and not show_diff:
+        return
+    header = (
+        _format_stat_header(rel_path, added, removed)
+        if show_stat
+        else f"{_BLOCK_INDENT}┌ {rel_path_str}"
+    )
+    lines.append(header)
+    if show_diff and diff_lines:
+        for diff_line in diff_lines:
+            lines.append(f"{_BLOCK_INDENT}│ {diff_line}")
+    if show_stat or (show_diff and total_changed > 0):
+        lines.append(_format_lines_changed(total_changed))
+    with stdout_lock:
+        for output_line in lines:
+            print(output_line)
 
 
 def check_group_is_empty(pgid: int) -> None:
@@ -2889,6 +2996,8 @@ def run_cli(
     runner_summary: bool,
     fixture_summary: bool,
     show_summary: bool,
+    show_diff_output: bool,
+    show_diff_stat: bool,
     jobs: int,
     keep_tmp_dirs: bool,
     passthrough: bool,
@@ -2937,6 +3046,8 @@ def run_cli(
             fixture_logger.propagate = True
 
         set_keep_tmp_dirs(bool(os.environ.get(_TMP_KEEP_ENV_VAR)) or keep_tmp_dirs)
+        set_show_diff_output(show_diff_output)
+        set_show_diff_stat(show_diff_stat)
         if passthrough:
             harness_mode = HarnessMode.PASSTHROUGH
         elif update:
@@ -3122,7 +3233,7 @@ def run_cli(
                 queue = _build_queue_from_paths(collected_paths, coverage=coverage)
                 queue.sort(key=_queue_sort_key, reverse=True)
                 project_queue_size = _count_queue_tests(queue)
-                job_count, enabled_flags = _summarize_harness_configuration(
+                job_count, enabled_flags, verb = _summarize_harness_configuration(
                     jobs=jobs,
                     update=update,
                     coverage=coverage,
@@ -3159,6 +3270,7 @@ def run_cli(
                     queue_size=project_queue_size,
                     job_count=job_count,
                     enabled_flags=enabled_flags,
+                    verb=verb,
                 )
                 count_width = max((len(str(count)) for _, count, _ in runner_breakdown), default=1)
                 for name, count, version in runner_breakdown:
@@ -3266,6 +3378,7 @@ def _print_project_start(
     queue_size: int,
     job_count: int,
     enabled_flags: str,
+    verb: str,
 ) -> None:
     project_name = selection.root.name or selection.root.as_posix()
     if selection.kind == "root":
@@ -3284,5 +3397,5 @@ def _print_project_start(
     toggles = f"; {enabled_flags}" if enabled_flags else ""
     jobs_segment = f" ({job_count} jobs)" if job_count else ""
     print(
-        f"{INFO} {project_display}: running {queue_size} tests{jobs_segment} from {project_kind} at {location_display}{toggles}"
+        f"{INFO} {project_display}: {verb} {queue_size} tests{jobs_segment} from {project_kind} at {location_display}{toggles}"
     )

{tenzir_test-0.9.3.dist-info → tenzir_test-0.9.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tenzir-test
-Version: 0.9.3
+Version: 0.9.5
 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
@@ -55,36 +55,6 @@ uvx tenzir-test --help
 `uvx` downloads the newest compatible release, runs it in an isolated
 environment, and caches subsequent invocations for fast reuse.
 
-## 🚀 Quick Start
-
-Create a project skeleton that mirrors the layout the harness expects:
-
-```text
-project-root/
-├── fixtures/
-│   └── http.py
-├── inputs/
-│   └── sample.ndjson
-├── runners/
-│   └── __init__.py
-└── tests/
-    ├── alerts/
-    │   ├── sample.py
-    │   └── sample.txt
-    └── regression/
-        ├── dummy.tql
-        └── dummy.txt
-```
-
-1. Author fixtures in `fixtures/` and register them at import time.
-2. Store reusable datasets in `inputs/`—the harness exposes the path via
-   `TENZIR_INPUTS` and provides a per-test scratch directory through
-   `TENZIR_TMP_DIR` when tests execute.
-   Use `--keep` (or `-k`) to preserve those temporary directories for debugging.
-3. Create tests in `tests/` and pair them with reference artifacts (for example
-   `.txt`) that the harness compares against.
-4. Run `uvx tenzir-test` from the project root to execute the full suite.
-
 ## 📚 Documentation
 
 Consult our [user guide](https://docs.tenzir.com/guides/testing/write-tests)

{tenzir_test-0.9.3.dist-info → tenzir_test-0.9.5.dist-info}/RECORD

@@ -1,11 +1,11 @@
 tenzir_test/__init__.py,sha256=JvAAO9W-9cJXKZaDEI-fiTGkdRDILfx7nC7H6sYDCpk,991
 tenzir_test/_python_runner.py,sha256=LmghMIolsNEC2wUyJdv1h_cefOxTxET1IACrw-_hHuY,2900
 tenzir_test/checks.py,sha256=VhZjU1TExqWzA1KcaW1xOGICpqb_G43AezrJIzw09eM,653
-tenzir_test/cli.py,sha256=APdImK6OgKAdvfdENuUa-Nk6q0IS2SJ_IZyAf7AXve8,4994
+tenzir_test/cli.py,sha256=O1FaxYFKWal--aqs-ZFT2URqL26_HjUtFNDACIBspXA,5452
 tenzir_test/config.py,sha256=q1_VEXuxL-xsGlnooeGvXxx9cMw652UEB9a1mPzZIQs,1680
 tenzir_test/packages.py,sha256=cTCQdGjCS1XmuKyiwh0ew-z9tHn6J-xZ6nvBP-hU8bc,948
 tenzir_test/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tenzir_test/run.py,sha256=aIVFmM7U3MX5meONg8vT5-4FoQoZRu8tc7CqRLU5YBk,112596
+tenzir_test/run.py,sha256=K6ZTQktVBLRMHQfx8322cKQzZIqQACa1PPXHO25TQNQ,116108
 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
@@ -22,8 +22,8 @@ tenzir_test/runners/runner.py,sha256=LtlD8huQOSmD7RyYDnKeCuI4Y6vhxGXMKsHA2qgfWN0
 tenzir_test/runners/shell_runner.py,sha256=wLiHYGrZDHPof6hohDT-t6zEi8w-DlkR5QG0i5DpwWE,5892
 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.9.3.dist-info/METADATA,sha256=gicldYcQVMjNqGk3vp9k0-bqBeOmEh6zAT0WAhqAKrw,3982
-tenzir_test-0.9.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-tenzir_test-0.9.3.dist-info/entry_points.txt,sha256=q0eD9RQ_9eMPYvFNpBElo55HQYeaPgLfe9YhLsNwl10,93
-tenzir_test-0.9.3.dist-info/licenses/LICENSE,sha256=ajMbpcBiSTXI8Rr4t17pvowV-On8DktghfZKxY_A22Q,10750
-tenzir_test-0.9.3.dist-info/RECORD,,
+tenzir_test-0.9.5.dist-info/METADATA,sha256=AFPYUhmvTIQ5XWmNBhmzTOb_2A_0gNu_kjWDc18LylQ,3007
+tenzir_test-0.9.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+tenzir_test-0.9.5.dist-info/entry_points.txt,sha256=q0eD9RQ_9eMPYvFNpBElo55HQYeaPgLfe9YhLsNwl10,93
+tenzir_test-0.9.5.dist-info/licenses/LICENSE,sha256=ajMbpcBiSTXI8Rr4t17pvowV-On8DktghfZKxY_A22Q,10750
+tenzir_test-0.9.5.dist-info/RECORD,,