Skip to content

Commit 7f7fa87

Browse files
rustyconoverclaude
andcommitted
ci: run the launcher-only test (accept launcher cache-key worker flags)
We run the launcher transport, so opt into VGI_REQUIRE_LAUNCHER_TRANSPORT=1 to run launcher/options_smoke.test (as `make test_launcher` does). That test appends extra argv (--describe, --threaded, ...) to the launch: LOCATION to vary the launcher cache key; the example worker rejected unknown args and exited, so the ATTACH produced 0 schemas. Accept the vgi-python fixture's launcher/log flags (--describe/--no-describe/--threaded/--quiet/-q/--debug/ --log-level) as no-ops in Main.runWorker. options_smoke.test now passes; suite is 172 pass / 12 skip. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
1 parent 435705f commit 7f7fa87

3 files changed

Lines changed: 21 additions & 3 deletions

File tree

CLAUDE.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,16 @@ without a C++ build:
265265
`ci/run-integration.sh` stages the preprocessed tree, sets the four
266266
`VGI_*_WORKER` vars (`launch:` + the three `ci/wrappers/` catalog wrappers —
267267
the committed, path-relative replacements for the old `/tmp/vgi-worker-*`),
268-
warms the extension cache once, and tallies pass/skip/fail. Green on Linux CI
269-
(**171 pass / 13 skip**) and macOS (**172/13** — one more because the
270-
`launch:` osx run includes a test the Linux exclusion drops). **Excludes**
268+
warms the extension cache once, then runs the whole suite in a **single
269+
unittest invocation** (like `make test_launcher`) so the CI log streams the
270+
native sqllogictest report (per-test progress + `All tests passed (… N
271+
assertions in M test cases)` — ~8700 assertions across the ~185 files), not a
272+
rolled-up count. Green on both lanes: **172 pass / 12 skip**. Sets
273+
`VGI_REQUIRE_LAUNCHER_TRANSPORT=1` (we *are* the launcher transport) so
274+
`launcher/options_smoke.test` runs — which required `Main.runWorker` to accept
275+
the launcher cache-key / fixture flags (`--describe`/`--no-describe`/
276+
`--threaded`/`--quiet`/`--debug`/`--log-level`) as no-ops instead of exiting
277+
on unknown argv. **Excludes**
271278
`bool_in_union.test` in addition to `nested_type_combinations` — CI surfaced
272279
that it characterizes a **pre-existing platform-dependent union-bool bug**:
273280
the worker reads uninitialized memory for boolean union variants after row 1

ci/run-integration.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ case "$TRANSPORT" in
6161
export VGI_VERSIONED_WORKER="launch:${HERE}/wrappers/vgi-worker-versioned"
6262
export VGI_VERSIONED_TABLES_WORKER="launch:${HERE}/wrappers/vgi-worker-versioned-tables"
6363
export VGI_ATTACH_OPTIONS_WORKER="launch:${HERE}/wrappers/vgi-worker-attach-options"
64+
# We are the launcher transport, so opt into the launcher-only tests
65+
# (launcher/options_smoke.test) — matches vgi's `make test_launcher`.
66+
export VGI_REQUIRE_LAUNCHER_TRANSPORT=1
6467
;;
6568
http)
6669
# Boot the example worker as an HTTP server on an ephemeral port; it prints

vgi-example-worker/src/main/java/farm/query/vgi/example/Main.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,6 +1049,14 @@ private static void runWorker(Worker w, String[] args) {
10491049
case "--unix" -> unixSocket = args[++i];
10501050
case "--idle-timeout" ->
10511051
idleTimeoutMs = (long) (Double.parseDouble(args[++i]) * 1000.0);
1052+
// Launcher cache-key / fixture-parity flags. The vgi-python
1053+
// fixture worker implements these (quiet/debug logging,
1054+
// description pages, threading); here they only need to be
1055+
// accepted, so a launch: LOCATION that appends them to vary the
1056+
// launcher cache key (launcher/options_smoke.test) starts the
1057+
// worker instead of being rejected.
1058+
case "--describe", "--no-describe", "--threaded", "--quiet", "-q", "--debug" -> { }
1059+
case "--log-level" -> i++; // consumes its value
10521060
default -> { System.err.println("unknown arg: " + args[i]); System.exit(2); }
10531061
}
10541062
}

0 commit comments

Comments
 (0)