Skip to content

Commit c6d0470

Browse files
Merge branch 'develop' into mitko/display/truncation-indicator
2 parents d89419b + 236d5cc commit c6d0470

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

vortex-test/compat-gen/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ Check modes:
8989

9090
| Mode | Extra files in dir | Missing fixtures |
9191
|------|--------------------|------------------|
92-
| `subset` (default) | Skipped | Error |
92+
| `superset` (default) | Error | Skipped |
9393
| `exact` | Error | Error |
94-
| `superset` | Error | Skipped |
94+
| `subset` | Skipped | Error |
9595

96-
Use `subset` when checking old versions (they may have extra fixtures not in
97-
current code). Use `exact` for the current version.
96+
Use `superset` when checking old versions (they may be missing newly-added
97+
fixtures). Use `exact` for the current version.
9898

9999
## Python Orchestrator: `compat.py`
100100

@@ -110,7 +110,7 @@ current code). Use `exact` for the current version.
110110

111111
1. Read `versions.json` from store
112112
2. For each version, download `arrays/manifest.json` + all `.vortex` files
113-
3. Run `vortex-compat check --dir <tmpdir> --mode subset`
113+
3. Run `vortex-compat check --dir <tmpdir> --mode superset`
114114
4. Aggregate results, exit 1 if any failures
115115

116116
### `generate --output <DIR> [--git-ref <REF>] [--exclude <CSV>]`

vortex-test/compat-gen/scripts/compat.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ def cmd_check(args: argparse.Namespace) -> None:
598598
total_failed += 1
599599

600600
_info(f" checking v{version}...")
601-
result = _run_rust_check(tmppath, mode="subset", profile=args.profile)
601+
result = _run_rust_check(tmppath, mode="superset", profile=args.profile)
602602

603603
passed = len(result.get("passed", []))
604604
failed_list = result.get("failed", [])
@@ -822,7 +822,7 @@ def _run_rust_generate(output: Path, profile: str = "release") -> None:
822822
_run_cmd([bin_path, "generate", "--output", str(output)], check=True)
823823

824824

825-
def _run_rust_check(dir: Path, mode: str = "subset", profile: str = "release") -> dict:
825+
def _run_rust_check(dir: Path, mode: str = "superset", profile: str = "release") -> dict:
826826
"""Run `vortex-compat check --dir <dir> --mode <mode>` and parse JSON stdout."""
827827
bin_path = _build_compat_bin(profile)
828828
cmd = [bin_path, "check", "--dir", str(dir), "--mode", mode]

vortex-test/compat-gen/src/main.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ EXAMPLES:\n\
2929
Generate fixtures into a directory:\n\
3030
vortex-compat generate --output /tmp/fixtures\n\
3131
\n\
32-
Check fixtures (allow extra files from older versions):\n\
33-
vortex-compat check --dir /tmp/v0.62.0 --mode subset\n\
32+
Check fixtures (default, old dir may be missing new fixtures):\n\
33+
vortex-compat check --dir /tmp/v0.62.0\n\
3434
\n\
3535
Check fixtures (strict, must match exactly):\n\
3636
vortex-compat check --dir /tmp/v0.63.0 --mode exact\n\
@@ -78,11 +78,11 @@ enum Commands {
7878

7979
/// How to handle mismatches between directory contents and known fixtures.
8080
///
81-
/// subset — directory may have extra files (skipped), all known must be present.
82-
/// Best for checking old versions that may have since-removed fixtures.
83-
/// exact — directory must match current fixtures 1:1. No extras, no missing.
8481
/// superset — directory may be missing files (skipped), no unknown files allowed.
85-
#[arg(long, default_value = "subset", value_name = "MODE")]
82+
/// Best for checking old versions that predate newly-added fixtures.
83+
/// exact — directory must match current fixtures 1:1. No extras, no missing.
84+
/// subset — directory may have extra files (skipped), all known must be present.
85+
#[arg(long, default_value = "superset", value_name = "MODE")]
8686
mode: check::Mode,
8787

8888
/// Fixture name substrings to exclude from checking (comma-separated).

0 commit comments

Comments
 (0)