diff --git a/quest/m0/ci/README.md b/quest/m0/ci/README.md index 88198329669..4e0f1ca29f0 100644 --- a/quest/m0/ci/README.md +++ b/quest/m0/ci/README.md @@ -82,7 +82,6 @@ The historical samples locate candidates; they are not controlled benchmarks. - [Every queued PR passes its own group](/quest/m0/ci/queue-allgreen.md) - the main queue switches from HEADGREEN to ALLGREEN, so a failed entry never merges behind a green one - [Require the release gate](/quest/m0/ci/release-gates.md) - condition: the next cut carries `release-gate.yml`; then release PRs require it -- [One test filter per line](/quest/m0/ci/interop-filter-lines.md) - parallel interop filter additions to `test/justfile` rarely conflict - [Share local check capacity](/quest/m0/ci/local-gate.md) - gate expensive phases and bound internal fanout - [Verify the R2 Rust cache](/quest/m0/ci/mbx-r2-verify.md) - condition: the maintainer bootstrap; then measure the hosted Nightly jobs' hits, restore time, and expiry - [Verify the Nix cache](/quest/m0/ci/nix-cache-verify.md) - confirm CI and releases use `nix.moq.dev` and retire Cachix diff --git a/quest/m0/ci/interop-filter-lines.md b/quest/m0/ci/interop-filter-lines.md deleted file mode 100644 index 140ec637a6b..00000000000 --- a/quest/m0/ci/interop-filter-lines.md +++ /dev/null @@ -1,37 +0,0 @@ -# [XS] One test filter per line in test/justfile - -## Goal - -Two PRs that each add an interop test filter or harness file to -`test/justfile` rarely conflict: they conflict only when both insert at the -same point of a sorted list, and that resolves by keeping both lines. Every -list on a single long line (the `interop` recipe's -`just rs test -p moq-net --lib ...` filters and the `harness` recipe's -browser test files) puts one entry per line, and the selected tests stay -exactly the same. - -## Plan - -Decided 2026-10-22 (maintainer): many PRs on 2026-10-22 conflicted on the -204-character filter line (`test/justfile:50`), for example -[moq-dev/moq#6158](https://github.com/moq-dev/moq/pull/6158), -[moq-dev/moq#6233](https://github.com/moq-dev/moq/pull/6233) and -[moq-dev/moq#6228](https://github.com/moq-dev/moq/pull/6228). -Rejected for now: MIGRATE.md entry fragments, and `merge=union` in -`.gitattributes`, which silently merges real conflicts. - -- Use just's line continuation (`\`) or a recipe variable, whichever keeps - `just --fmt --check` and the `gh`/justfile lints clean. -- Sort each list, so new entries land at different points instead of all at - the end, and close it with a fixed line that holds no entry (the - `--run-ignored all` flags, for example), so adding an entry never edits a - neighbor's line to add or drop its continuation. -- Line layout alone cannot make two inserts at the same point merge cleanly; - only one file per entry could, which costs more than the conflicts it - saves. -- Keep the prose comment above the recipe, but stop it repeating the filter - list, so a new filter edits one place. -- Prove nothing changed: compare the expanded commands (`just --dry-run`) - before and after. - -Public API: none. Wire: none. diff --git a/test/justfile b/test/justfile index a783bd33f9f..4e95f5cfa71 100644 --- a/test/justfile +++ b/test/justfile @@ -16,6 +16,21 @@ set working-directory := '.' # Where cargo puts the in-tree qmux interop examples `just test qmux` runs. qmux_examples := absolute_path(env("CARGO_TARGET_DIR", source_directory() / ".." / "target")) / "debug" / "examples" +harness_browser_tests := ''' + ./capture-channel-count.browser.ts + ./harness.browser.ts + ./open-gop.browser.ts + ./publish-ui.browser.ts + ./signals-dom.browser.ts + ./src/contract.test.ts + ./src/resume.test.ts +''' + +harness_compat_tests := ''' + test/interop/compat/claims.test.ts + test/interop/compat/resolve.test.ts +''' + # List the cross-language suites. default: @just --justfile {{ quote(justfile()) }} --list test @@ -28,9 +43,9 @@ harness: ./interop/relay-log.test.sh python3 interop/report.test.py python3 interop/tone.test.py - cd .. && bun test test/interop/compat/resolve.test.ts test/interop/compat/claims.test.ts + cd .. && bun test {{ replace(harness_compat_tests, "\n", " ") }} cd .. && bun install --frozen-lockfile - cd interop/clients/js && bun test ./harness.browser.ts ./signals-dom.browser.ts ./publish-ui.browser.ts ./capture-channel-count.browser.ts ./open-gop.browser.ts ./src/contract.test.ts ./src/resume.test.ts + cd interop/clients/js && bun test {{ replace(harness_browser_tests, "\n", " ") }} # Cross-language media interop test, built from this checkout. Stands up a # relay and runs the publisher x subscriber matrix. Default: rust only (fast @@ -40,15 +55,19 @@ harness: # `just test interop --publishers rust,python --subscribers rust,c`. # Finite track tails run too; `--tail` selects just the CLI FETCH close and Rust/Node/Bun tail checks. # `--versions ietf` reruns them with every client pinned to each even moq-transport draft. -# Both runs first check js/net's varints against moq-net's encoder at every size boundary, -# and on lite-06/07 messages (the filter also matches `lite_varint_interop`), then -# moq-transport OBJECT_DATAGRAMs both ways and the JS answer to TRACK_STATUS on every -# draft, Lite AUTH_ERROR NOT_SUPPORTED after a grant, Lite padding, and lite-07 TRACKS -# listings, each in both directions. +# Both runs first check the Rust/JS wire and session interop suites, in both directions. [positional-arguments] interop *args: cd .. && bun install --frozen-lockfile - just rs test -p moq-net --lib varint_interop ietf_datagram_interop ietf_track_status_interop ietf_compression_fallback_interop auth_unsupported_interop padding_interop tracks_interop --run-ignored all + just rs test -p moq-net --lib \ + auth_unsupported_interop \ + ietf_compression_fallback_interop \ + ietf_datagram_interop \ + ietf_track_status_interop \ + padding_interop \ + tracks_interop \ + varint_interop \ + --run-ignored all ./interop/interop.sh "$@" # The harnesses append one record per case to MOQ_TEST_RESULTS; flags link the page to its