Faster tests, split everywhere: one sharded CI for pushes and releases
- The harness builds the DOM without the page's 2 MB of script text and runs the scripts straight in the window: a page load in tests takes about half the time (jsdom's parser was slow on the script text). - That also took the game's source out of the DOM, which showed three tests that matched a phrase in the page source rather than the screen; they now check the panel, the routing window and the dictionary. - CI plans its split once and runs the tests on 6 runners; every run on main records each file's time and caches it, so the parts stay even without anyone refreshing tests/durations.json. - auto-release.yml and release.yml call the same sharded tests instead of running all 170 files on one runner each (11 and 15 min); a release is tested once, before it is tagged. - Audit: five tests that duplicated a gameplay rule or checked nothing are gone; the two slowest checks sample a third of the cities, and a year of play to reach one due date became a moved due date.
This commit is contained in:
parent
7a6eb29013
commit
0342d90657
17 changed files with 244 additions and 109 deletions
49
.github/workflows/auto-release.yml
vendored
49
.github/workflows/auto-release.yml
vendored
|
|
@ -20,18 +20,19 @@ concurrency:
|
|||
cancel-in-progress: false
|
||||
|
||||
jobs:
|
||||
release:
|
||||
check:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
outputs:
|
||||
skip: ${{ steps.v.outputs.skip }}
|
||||
ver: ${{ steps.v.outputs.ver }}
|
||||
tag: ${{ steps.v.outputs.tag }}
|
||||
pre: ${{ steps.v.outputs.pre }}
|
||||
steps:
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
|
||||
with:
|
||||
node-version: 24
|
||||
cache: npm
|
||||
|
||||
- name: Work out the version and whether it is new
|
||||
id: v
|
||||
|
|
@ -57,34 +58,40 @@ jobs:
|
|||
case "$ver" in *-*) echo "pre=true" >> "$GITHUB_OUTPUT";; *) echo "pre=false" >> "$GITHUB_OUTPUT";; esac
|
||||
echo "skip=false" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: Test before releasing
|
||||
if: steps.v.outputs.skip == 'false'
|
||||
run: npm ci && npm test
|
||||
# The same tests as every push, split over several runners (ci.yml), before anything is tagged.
|
||||
tests:
|
||||
needs: check
|
||||
if: needs.check.outputs.skip == 'false'
|
||||
uses: ./.github/workflows/ci.yml
|
||||
|
||||
release:
|
||||
needs: [check, tests]
|
||||
if: needs.check.outputs.skip == 'false'
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
TAG: ${{ needs.check.outputs.tag }}
|
||||
VER: ${{ needs.check.outputs.ver }}
|
||||
PRE: ${{ needs.check.outputs.pre }}
|
||||
steps:
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
|
||||
- name: Publish the release
|
||||
if: steps.v.outputs.skip == 'false'
|
||||
env:
|
||||
TAG: ${{ steps.v.outputs.tag }}
|
||||
VER: ${{ steps.v.outputs.ver }}
|
||||
PRE: ${{ steps.v.outputs.pre }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
awk -v v="$VER" 'index($0,"## ["v"]")==1{f=1;next} /^## \[/{f=0} f' CHANGELOG.md | sed -e '/./,$!d' > notes.md
|
||||
pre=(); [ "$PRE" = "true" ] && pre=(--prerelease)
|
||||
gh release create "$TAG" --repo "$GITHUB_REPOSITORY" \
|
||||
--target "$GITHUB_SHA" --title "$VER" --notes-file notes.md "${pre[@]}"
|
||||
|
||||
- name: Deploy it
|
||||
# Pre-releases are for testing and never go live.
|
||||
if: steps.v.outputs.skip == 'false' && steps.v.outputs.pre == 'false'
|
||||
env:
|
||||
TAG: ${{ steps.v.outputs.tag }}
|
||||
run: gh workflow run release.yml --repo "$GITHUB_REPOSITORY" --ref "$TAG" -f tag="$TAG"
|
||||
# Pre-releases are for testing and never go live. The tag was just tested above, so the deploy does not
|
||||
# test it again (tested=true).
|
||||
if: env.PRE == 'false'
|
||||
run: gh workflow run release.yml --repo "$GITHUB_REPOSITORY" --ref "$TAG" -f tag="$TAG" -f tested=true
|
||||
|
||||
- name: Publish the Docker image
|
||||
# Same pattern as the deploy above: the image is built and pushed from the
|
||||
# release tag by docker.yml. Pre-releases get one too: an image tag is
|
||||
# pulled on purpose, so a test image costs nothing.
|
||||
if: steps.v.outputs.skip == 'false'
|
||||
env:
|
||||
TAG: ${{ steps.v.outputs.tag }}
|
||||
run: gh workflow run docker.yml --repo "$GITHUB_REPOSITORY" --ref "$TAG" -f tag="$TAG"
|
||||
|
|
|
|||
107
.github/workflows/ci.yml
vendored
107
.github/workflows/ci.yml
vendored
|
|
@ -1,44 +1,89 @@
|
|||
name: CI
|
||||
|
||||
# Every push and PR, and the releases too (auto-release.yml and release.yml call this workflow), so the tests run
|
||||
# one way, split over several runners, everywhere.
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
pull_request:
|
||||
workflow_call:
|
||||
inputs:
|
||||
ref:
|
||||
description: The commit or tag to test (a release tag); the caller's commit when empty
|
||||
type: string
|
||||
default: ''
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
# A newer push to the same pull request makes the older run pointless: cancel it instead of queueing behind it.
|
||||
# Runs on main always finish.
|
||||
# Runs on main always finish. A release's call gets a group of its own, so it never waits behind main's push run.
|
||||
concurrency:
|
||||
group: ci-${{ github.ref }}
|
||||
group: ci-${{ github.event_name == 'pull_request' && github.ref || github.run_id }}${{ inputs.ref }}
|
||||
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
|
||||
|
||||
env:
|
||||
# Runners for the tests. Standard GitHub-hosted runners (4 cores each) are the only free ones for a public repo,
|
||||
# and a run may use up to 20 at once, so more parts is how the tests get faster. Each part costs ~30 s of setup.
|
||||
PARTS: 6
|
||||
|
||||
jobs:
|
||||
# The tests in four parts of about equal time, each on its own runner, each running as many files at once as
|
||||
# it has cores (scripts/test.js; the split comes from tests/durations.json).
|
||||
# Splits the test files into parts of about equal time, once, so every part works from the same plan. The times
|
||||
# come from the last run on main (the cache, see "timings" below), else from the committed tests/durations.json.
|
||||
plan:
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
parts: ${{ steps.plan.outputs.parts }}
|
||||
steps:
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
ref: ${{ inputs.ref }}
|
||||
- uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
|
||||
with:
|
||||
path: tests/durations.json
|
||||
key: test-durations-${{ github.run_id }}
|
||||
restore-keys: test-durations-
|
||||
- id: plan
|
||||
run: echo "parts=$(node scripts/test.js --plan "$PARTS")" >> "$GITHUB_OUTPUT"
|
||||
|
||||
part:
|
||||
name: test ${{ matrix.part }}/4
|
||||
name: part ${{ strategy.job-index }}
|
||||
needs: plan
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
part: [1, 2, 3, 4]
|
||||
files: ${{ fromJSON(needs.plan.outputs.parts) }}
|
||||
steps:
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
ref: ${{ inputs.ref }}
|
||||
- uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
|
||||
with:
|
||||
node-version: 24
|
||||
cache: npm
|
||||
- run: npm ci
|
||||
- run: npm test -- --shard ${{ matrix.part }}/4
|
||||
- name: Tests
|
||||
env:
|
||||
FILES: ${{ matrix.files }}
|
||||
# Word splitting on purpose: FILES is a space-separated list of tests/*.test.js paths.
|
||||
run: npm test -- --timings "$RUNNER_TEMP/timings.json" $FILES
|
||||
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
||||
if: always()
|
||||
with:
|
||||
name: timings-${{ strategy.job-index }}
|
||||
path: ${{ runner.temp }}/timings.json
|
||||
retention-days: 1
|
||||
if-no-files-found: ignore
|
||||
|
||||
build:
|
||||
name: build
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
ref: ${{ inputs.ref }}
|
||||
- uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
|
||||
with:
|
||||
node-version: 24
|
||||
|
|
@ -47,21 +92,12 @@ jobs:
|
|||
- name: Build (not deployed — only releases deploy)
|
||||
run: npm run build
|
||||
|
||||
# The one check to look at, named as before: green only when every part and the build are.
|
||||
test:
|
||||
needs: [part, build]
|
||||
if: always()
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Every part and the build passed
|
||||
run: |
|
||||
echo "parts: ${{ needs.part.result }}, build: ${{ needs.build.result }}"
|
||||
test "${{ needs.part.result }}" = success && test "${{ needs.build.result }}" = success
|
||||
|
||||
translations:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
with:
|
||||
ref: ${{ inputs.ref }}
|
||||
- uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
|
||||
with:
|
||||
node-version: 24
|
||||
|
|
@ -69,3 +105,38 @@ jobs:
|
|||
- run: npm ci
|
||||
- name: Translation coverage
|
||||
run: node scripts/i18n-check.js --summary "$GITHUB_STEP_SUMMARY"
|
||||
|
||||
# The one check to look at: green only when the plan, every part, the build and the translations are.
|
||||
test:
|
||||
needs: [plan, part, build, translations]
|
||||
if: always()
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Everything passed
|
||||
run: |
|
||||
echo "plan: ${{ needs.plan.result }}, parts: ${{ needs.part.result }}, build: ${{ needs.build.result }}, translations: ${{ needs.translations.result }}"
|
||||
test "${{ needs.plan.result }}" = success && test "${{ needs.part.result }}" = success
|
||||
test "${{ needs.build.result }}" = success && test "${{ needs.translations.result }}" = success
|
||||
|
||||
# After a run on main: each file's time from this run goes into the cache, so the next run (main or a PR) splits
|
||||
# its parts by today's tests. Nobody has to remember to refresh tests/durations.json.
|
||||
timings:
|
||||
needs: part
|
||||
if: always() && github.event_name == 'push' && github.ref == 'refs/heads/main' && needs.part.result != 'skipped'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
||||
- uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
|
||||
with:
|
||||
path: tests/durations.json
|
||||
key: test-durations-${{ github.run_id }}
|
||||
restore-keys: test-durations-
|
||||
- uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
|
||||
with:
|
||||
pattern: timings-*
|
||||
path: ${{ runner.temp }}/timings
|
||||
- run: node scripts/test-timings.js --merge "$RUNNER_TEMP/timings"
|
||||
- uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
|
||||
with:
|
||||
path: tests/durations.json
|
||||
key: test-durations-${{ github.run_id }}
|
||||
|
|
|
|||
20
.github/workflows/release.yml
vendored
20
.github/workflows/release.yml
vendored
|
|
@ -23,6 +23,10 @@ on:
|
|||
description: Only the weekly puzzles changed (weekly-puzzle.yml); the release itself was tested when it shipped
|
||||
type: boolean
|
||||
default: false
|
||||
tested:
|
||||
description: The tag's tests already passed (auto-release.yml tests it before tagging)
|
||||
type: boolean
|
||||
default: false
|
||||
|
||||
# Least privilege: only the deploy job can write to Pages.
|
||||
permissions:
|
||||
|
|
@ -33,9 +37,18 @@ concurrency:
|
|||
cancel-in-progress: false
|
||||
|
||||
jobs:
|
||||
# The release's tests, split over several runners like every push (ci.yml). Skipped when auto-release.yml has just
|
||||
# run them on this tag, and for a weekly redeploy (the build step below tests the weekly files against the tag).
|
||||
tests:
|
||||
if: ${{ (github.event_name == 'workflow_dispatch' || !github.event.release.prerelease) && !inputs.weekly && !inputs.tested }}
|
||||
uses: ./.github/workflows/ci.yml
|
||||
with:
|
||||
ref: ${{ github.event.release.tag_name || inputs.tag }}
|
||||
|
||||
build:
|
||||
needs: tests
|
||||
# Pre-releases are for testing and never go live.
|
||||
if: ${{ github.event_name == 'workflow_dispatch' || !github.event.release.prerelease }}
|
||||
if: ${{ always() && (github.event_name == 'workflow_dispatch' || !github.event.release.prerelease) && (needs.tests.result == 'success' || needs.tests.result == 'skipped') }}
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
TAG: ${{ github.event.release.tag_name || inputs.tag }}
|
||||
|
|
@ -93,10 +106,9 @@ jobs:
|
|||
node scripts/weekly-puzzle.js --check
|
||||
if [ -f scripts/weekly-scenario.js ]; then node scripts/weekly-scenario.js --check; fi
|
||||
if [ -f scripts/weekly-architect.js ]; then node scripts/weekly-architect.js --check; fi
|
||||
- run: npm test
|
||||
if: ${{ !inputs.weekly }}
|
||||
# The weekly files come from main, not the tag: whatever tested the tag, they are tested against it here.
|
||||
- name: Test the weekly puzzles against this release
|
||||
if: ${{ inputs.weekly && hashFiles('scripts/weekly-puzzle.js') != '' }}
|
||||
if: ${{ hashFiles('scripts/weekly-puzzle.js') != '' }}
|
||||
run: npm test -- tests/weekly-puzzle.test.js tests/puzzles.test.js $(ls tests/weekly-scenario.test.js tests/weekly-architect.test.js 2>/dev/null)
|
||||
- name: Build site
|
||||
run: VERSION="${TAG#v}" REQUIRE_NOTES=1 npm run build
|
||||
|
|
|
|||
|
|
@ -80,9 +80,10 @@ Development runs on `npm run dev` (assembles the development page on every reque
|
|||
| `scripts/agent/relay.js`, `scripts/lib/mcp-browser.js`, `scripts/lib/relay-client.js` | The agent relay `npm run dev` hosts at `/agent`, and the MCP server's side of it: how a tool reaches the game in the player's tab |
|
||||
| `scripts/i18n-check.js`, `scripts/i18n-add.js`, `scripts/lib/dict.js` | Translation coverage and dictionary order; adding, renaming and removing entries |
|
||||
| `scripts/legacy/` | The splitter that made `src/` from the old `site/index.html` (and gave its text labels), and `port-branch.js`, which carries older branches over |
|
||||
| `tests/harness.js` | Loads the assembled page in jsdom with a seeded `Math.random` and a fake canvas: the players' page, or the development page with `{agent: true}` |
|
||||
| `.github/workflows/ci.yml` | Tests and build on every push and PR |
|
||||
| `.github/workflows/auto-release.yml` | On a `package.json` version bump on `main`: test, tag, GitHub release from the CHANGELOG, start the deploy |
|
||||
| `tests/harness.js` | Loads the assembled page in jsdom with a seeded `Math.random` and a fake canvas: the players' page, or the development page with `{agent: true}`. The page's scripts run straight in the window (jsdom's parser is slow on 2 MB of script) |
|
||||
| `scripts/test.js`, `tests/durations.json` | Runs the tests, every file in its own process; splits them into parts of equal time for CI (`--plan`, `--shard`) by each file's seconds, which CI refreshes after every run on `main` |
|
||||
| `.github/workflows/ci.yml` | Tests (split over 6 runners), build and translations on every push and PR; the releases call it too, so the tests run one way everywhere |
|
||||
| `.github/workflows/auto-release.yml` | On a `package.json` version bump on `main`: test (ci.yml), tag, GitHub release from the CHANGELOG, start the deploy (already tested, so it does not test again) |
|
||||
| `.github/workflows/release.yml` | Builds and deploys to GitHub Pages, the only workflow that can |
|
||||
| `.github/workflows/weekly-puzzle.yml` | Sunday 03:37 UTC: makes the week's puzzle, commits it to `main` (data only, no release) and starts `release.yml` for the live release tag with `weekly=true` |
|
||||
| `scripts/weekly-puzzle.js`, `site/puzzles/weekly/` | The weekly puzzle generator and its output, one `<key>.json` per week plus `index.json` (see below) |
|
||||
|
|
|
|||
18
scripts/lib/timings-reporter.js
Normal file
18
scripts/lib/timings-reporter.js
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
// A node:test reporter that writes how long each test file took, as JSON {"tests/x.test.js": seconds}, to its
|
||||
// destination. scripts/test.js adds it next to the usual output with --timings FILE; CI merges the parts' files
|
||||
// into tests/durations.json, which the next run splits its parts by.
|
||||
const path = require('node:path');
|
||||
|
||||
module.exports = async function* timings(source) {
|
||||
const sec = {};
|
||||
for await (const { type, data } of source) {
|
||||
// Top-level tests only: their durations include their subtests.
|
||||
if ((type === 'test:pass' || type === 'test:fail') && data.nesting === 0 && data.file && data.details) {
|
||||
const f = path.relative(process.cwd(), data.file).split(path.sep).join('/');
|
||||
sec[f] = (sec[f] || 0) + (data.details.duration_ms || 0) / 1000;
|
||||
}
|
||||
}
|
||||
const out = {};
|
||||
for (const f of Object.keys(sec).sort()) out[f] = Math.round(sec[f] * 10) / 10;
|
||||
yield JSON.stringify(out, null, 1) + '\n';
|
||||
};
|
||||
|
|
@ -5,6 +5,7 @@
|
|||
// machine has cores, so absolute numbers vary, but their sizes relative to each other are what count.
|
||||
//
|
||||
// npm run test:timings
|
||||
// node scripts/test-timings.js --merge DIR (CI) fold the parts' --timings files into it
|
||||
const fs = require('node:fs');
|
||||
const os = require('node:os');
|
||||
const path = require('node:path');
|
||||
|
|
@ -12,6 +13,24 @@ const { spawn } = require('node:child_process');
|
|||
|
||||
const root = path.join(__dirname, '..');
|
||||
const dir = path.join(root, 'tests');
|
||||
|
||||
// --merge DIR: fold the timings CI's parts wrote (scripts/test.js --timings) into tests/durations.json. Files that are
|
||||
// gone drop out; files no part ran keep their old time.
|
||||
const mi = process.argv.indexOf('--merge');
|
||||
if (mi >= 0) {
|
||||
const from = process.argv[mi + 1], dur = path.join(dir, 'durations.json');
|
||||
let out = {};
|
||||
try { out = JSON.parse(fs.readFileSync(dur, 'utf8')); } catch (e) { /* none yet */ }
|
||||
let n = 0;
|
||||
for (const f of fs.readdirSync(from, { recursive: true }).filter((f) => String(f).endsWith('.json'))) {
|
||||
for (const [k, v] of Object.entries(JSON.parse(fs.readFileSync(path.join(from, String(f)), 'utf8')))) if (v > 0) { out[k] = v; n++; }
|
||||
}
|
||||
const have = new Set(fs.readdirSync(dir).filter((f) => f.endsWith('.test.js')).map((f) => 'tests/' + f));
|
||||
const sorted = Object.fromEntries(Object.keys(out).filter((k) => have.has(k)).sort().map((k) => [k, out[k]]));
|
||||
fs.writeFileSync(dur, JSON.stringify(sorted, null, 1) + '\n');
|
||||
console.log(`merged ${n} timings; tests/durations.json has ${Object.keys(sorted).length} of ${have.size} files`);
|
||||
process.exit(0);
|
||||
}
|
||||
const files = fs.readdirSync(dir).filter((f) => f.endsWith('.test.js')).sort().map((f) => 'tests/' + f);
|
||||
const jobs = Math.max(1, parseInt(process.env.TEST_JOBS, 10) || os.availableParallelism());
|
||||
const out = {};
|
||||
|
|
|
|||
|
|
@ -5,14 +5,18 @@
|
|||
//
|
||||
// npm test everything
|
||||
// npm test -- tests/peering.test.js just these files (other arguments go to node --test)
|
||||
// npm test -- --shard 2/4 one of four parts of about equal time (CI runs the four at once)
|
||||
// npm test -- --shard 2/4 one of four parts of about equal time
|
||||
// npm test -- --shard 2/4 --list which files that part holds, without running them
|
||||
// node scripts/test.js --plan 6 the split into 6 parts as JSON (CI's plan job: one list per runner)
|
||||
// npm test -- --timings out.json also write each file's seconds to out.json (CI merges these into
|
||||
// the durations the next run splits by)
|
||||
// TEST_JOBS=1 npm test one file at a time, as it used to be
|
||||
// npm test -- --stress 8 tests/x.test.js hunt a flaky test: 8 copies of these files at once, on a machine kept
|
||||
// busier than CI ever is, and how many runs failed (and why)
|
||||
//
|
||||
// Parts are balanced by tests/durations.json, each file's typical seconds (refresh: npm run test:timings).
|
||||
// A file missing from it counts as a typical one, so a stale list only makes the parts a little uneven.
|
||||
// Parts are balanced by tests/durations.json, each file's typical seconds. CI keeps it fresh in its cache from every
|
||||
// run on main (.github/workflows/ci.yml); npm run test:timings rewrites the committed copy. A file missing from it
|
||||
// counts as a typical one, so a stale list only makes the parts a little uneven.
|
||||
const fs = require('node:fs');
|
||||
const os = require('node:os');
|
||||
const path = require('node:path');
|
||||
|
|
@ -31,6 +35,12 @@ if (ti >= 0) {
|
|||
if (!(stress >= 1)) { console.error('--stress wants a count, like --stress 8'); process.exit(2); }
|
||||
args.splice(ti, 2);
|
||||
}
|
||||
let timings = null;
|
||||
const tmi = args.indexOf('--timings');
|
||||
if (tmi >= 0) { timings = args[tmi + 1]; args.splice(tmi, 2); if (!timings) { console.error('--timings wants a file'); process.exit(2); } }
|
||||
let plan = 0;
|
||||
const pi = args.indexOf('--plan');
|
||||
if (pi >= 0) { plan = parseInt(args[pi + 1], 10); args.splice(pi, 2); if (!(plan >= 1)) { console.error('--plan wants a count, like --plan 6'); process.exit(2); } }
|
||||
let shard = null;
|
||||
const si = args.indexOf('--shard');
|
||||
if (si >= 0) {
|
||||
|
|
@ -58,6 +68,10 @@ function part(list, i, n) {
|
|||
}
|
||||
return out[i - 1].sort();
|
||||
}
|
||||
if (plan) {
|
||||
console.log(JSON.stringify(Array.from({ length: plan }, (_, i) => part(files, i + 1, plan).join(' '))));
|
||||
process.exit(0);
|
||||
}
|
||||
if (shard && files.length) {
|
||||
files = part(files, shard[0], shard[1]);
|
||||
console.log(`# part ${shard[0]}/${shard[1]}: ${files.length} files`);
|
||||
|
|
@ -84,5 +98,7 @@ if (stress) {
|
|||
});
|
||||
return;
|
||||
}
|
||||
const r = spawnSync(process.execPath, ['--test', `--test-concurrency=${jobs}`, ...args, ...files], { stdio: 'inherit', cwd: root });
|
||||
const rep = timings ? ['--test-reporter=spec', '--test-reporter-destination=stdout',
|
||||
`--test-reporter=${path.join(__dirname, 'lib', 'timings-reporter.js')}`, `--test-reporter-destination=${timings}`] : [];
|
||||
const r = spawnSync(process.execPath, ['--test', `--test-concurrency=${jobs}`, ...rep, ...args, ...files], { stdio: 'inherit', cwd: root });
|
||||
process.exit(r.status ?? 1);
|
||||
|
|
|
|||
|
|
@ -38,9 +38,10 @@ test('a new network runs plain IGP: no Auto-TE until the backbone is upgraded, o
|
|||
assert.deepEqual(JSON.parse(ev('JSON.stringify(S.core)')), { lv: 0, run: 0 });
|
||||
ev('ACT.buyTE()');
|
||||
assert.equal(ev('!!S.te'), false, 'no Auto-TE on plain IGP');
|
||||
ev("ACT.leftTab({t:'noc'})");
|
||||
assert.match(dom.window.document.body.textContent, /Backbone/);
|
||||
assert.match(dom.window.document.body.textContent, /Auto-TE needs an RSVP-TE/);
|
||||
// The backbone lives in the NOC's routing window; the refusal is a toast.
|
||||
ev('ACT.routingOpen()');
|
||||
assert.match(dom.window.document.getElementById('modal').textContent, /Backbone/);
|
||||
assert.match(dom.window.document.getElementById('toasts').textContent, /Auto-TE needs an RSVP-TE/);
|
||||
const cash = ev('S.cash');
|
||||
ev('ACT.coreUp()');
|
||||
assert.equal(ev('S.core.lv'), 1);
|
||||
|
|
|
|||
|
|
@ -23,14 +23,6 @@ test('#257 the calendar has real months and leap years',()=>{
|
|||
assert.deepEqual(errors,[]);
|
||||
}finally{dom.window.close();}
|
||||
});
|
||||
test('#257 a calendar month costs its monthly price, whatever its length',()=>{
|
||||
const {ev,dom}=load();try{
|
||||
ev("ACT.start({});S.day=31");// 1 February Y1
|
||||
const before=ev('S.cash'),net=ev('R.revMo-R.costMo');
|
||||
ev("for(let i=0;i<28;i++)S.cash+=(R.revMo-R.costMo)/monLen(S.day+i)");
|
||||
assert.ok(Math.abs(ev('S.cash')-before-net)<1e-6,'28 days of February add up to one month');
|
||||
}finally{dom.window.close();}
|
||||
});
|
||||
test('#257 loan statements and the intern budget follow calendar months',()=>{
|
||||
const {ev,dom}=load();try{
|
||||
ev("ACT.start({})");
|
||||
|
|
|
|||
|
|
@ -15,12 +15,6 @@ test('every city sits on its landmass', () => {
|
|||
assert.equal(off, '');
|
||||
});
|
||||
|
||||
test('every cable lands at two known cities and has a length', () => {
|
||||
const { ev } = load();
|
||||
const bad = ev("CABLE_PAIRS.filter(c=>!CITY[c.a]||!CITY[c.b]||!(c.km>0)).map(c=>c.cid).join()");
|
||||
assert.equal(bad, '');
|
||||
});
|
||||
|
||||
test('a year of scripted play stays healthy', () => {
|
||||
const { ev, errors } = load();
|
||||
seed(ev, 7);
|
||||
|
|
|
|||
|
|
@ -6,12 +6,33 @@
|
|||
// it fails here rather than in production.
|
||||
const fs = require('node:fs');
|
||||
const path = require('node:path');
|
||||
const vm = require('node:vm');
|
||||
const { JSDOM, VirtualConsole } = require('jsdom');
|
||||
const { assemble } = require('../scripts/lib/page');
|
||||
|
||||
const PAGE = {};
|
||||
const page = (dev) => PAGE[dev] || (PAGE[dev] = assemble({ dev }).html);
|
||||
|
||||
// The page's inline scripts, taken out of the HTML once per process and compiled once. jsdom's HTML parser is slow
|
||||
// on 2 MB of script text (it was more than half of every load()), so the DOM is built from the rest of the page and
|
||||
// the scripts then run in its window, in order, the same way jsdom runs them (vm.Script.runInContext). Only plain
|
||||
// <script> tags run, as in the browser here; data blocks (ld+json) stay in the page untouched.
|
||||
const SPLIT = new Map();
|
||||
function split(html) {
|
||||
let s = SPLIT.get(html);
|
||||
if (s) return s;
|
||||
const code = [];
|
||||
const shell = html.replace(/<script>([\s\S]*?)<\/script>/g, (m, src) => {
|
||||
code.push(new vm.Script(src, { filename: `page-script-${code.length}.js` }));
|
||||
return '<script></script>';
|
||||
});
|
||||
// With scripting on, the parser keeps a <noscript>'s content as text; with scripts run from outside it builds those
|
||||
// elements (an extra <h1>, <p>, <div>). Escaped, the content stays one text node, as players' browsers have it.
|
||||
const page = shell.replace(/(<noscript>)([\s\S]*?)(<\/noscript>)/g, (m, a, body, b) => a + body.replace(/&/g, '&').replace(/</g, '<') + b);
|
||||
SPLIT.set(html, s = { shell: page, code });
|
||||
return s;
|
||||
}
|
||||
|
||||
// opts.file: a built or older page to load instead (the perf bench, the release build test).
|
||||
// opts.agent: the development page, with src/agent/.
|
||||
function load(opts = {}) {
|
||||
|
|
@ -22,12 +43,13 @@ function load(opts = {}) {
|
|||
// jsdom has no canvas; drawing calls are expected to be unimplemented.
|
||||
if (!/getContext|Not implemented/.test(e.message)) errors.push(e.message);
|
||||
});
|
||||
const dom = new JSDOM(html, {
|
||||
const { shell, code } = split(html);
|
||||
const dom = new JSDOM(shell, {
|
||||
// opts.url: the origin the page is "served" from. Tests that dial the agent relay pass the relay's own host, so
|
||||
// the page's WebSocket Origin matches (the relay refuses a cross-site one); everything else stays on a made-up
|
||||
// https origin nothing can reach.
|
||||
url: opts.url || 'https://tests.invalid/',
|
||||
runScripts: 'dangerously',
|
||||
runScripts: 'outside-only',
|
||||
pretendToBeVisual: true,
|
||||
virtualConsole: vc,
|
||||
beforeParse(window) {
|
||||
|
|
@ -61,6 +83,14 @@ function load(opts = {}) {
|
|||
window.HTMLCanvasElement.prototype.toBlob = (cb) => cb(null);
|
||||
},
|
||||
});
|
||||
// The language picker document.write()s a dictionary <script src> for a non-English player. jsdom fetched nothing
|
||||
// for it anyway (opts.lang registers the dictionary), and after parsing a real write would wipe the page.
|
||||
const doc = dom.window.document, ctx = dom.getInternalVMContext();
|
||||
doc.write = () => {};
|
||||
for (const sc of code) {
|
||||
try { sc.runInContext(ctx); } catch (e) { vc.emit('jsdomError', Object.assign(new Error(`Uncaught [${e}]`), { detail: e })); }
|
||||
}
|
||||
delete doc.write;
|
||||
const ev = (src) => dom.window.eval(src);
|
||||
// Deterministic by default so a test never passes or fails by luck; pass {seed:false} to opt out.
|
||||
// (Seeded in beforeParse, so the game's own seeded-games wrapper around Math.random stays in place.)
|
||||
|
|
|
|||
|
|
@ -19,11 +19,13 @@ test('diversity map: the indexed graph answers like disjointRoutes() over every
|
|||
const cp = ev('CABLE_PAIRS[0].cid+":"+CABLE_PAIRS[0].a+"-"+CABLE_PAIRS[0].b');
|
||||
for (const st of [{ won: false }, { won: true }, { won: false, scn: { rules: { banCities: ['jam', 'lon'], banPairs: [cp] } } }]) {
|
||||
const r = JSON.parse(ev(`(()=>{const st=${lit(st)},L=plainLinks(st);diversityMap=null;diversityPossible('fra','nyc',st);
|
||||
const ids=CITIES.map(c=>c.id),bad=[];let n=0;for(let i=0;i<ids.length;i+=3)for(let j=i+1;j<ids.length;j+=3){n++;const a=ids[i],b=ids[j];
|
||||
const ids=CITIES.map(c=>c.id),bad=[];let n=0;for(let i=0;i<ids.length;i+=9)for(let j=i+1;j<ids.length;j+=9){n++;const a=ids[i],b=ids[j];
|
||||
const want=(st.scn&&st.scn.rules.banCities.some(x=>x===a||x===b))?diversityPossible(a,b,st):disjointRoutes(a,b,L);if(diversityPossible(a,b,st)!==want)bad.push(a+'-'+b);}
|
||||
return JSON.stringify({links:L.length,mine:diversityMap.links,n,bad})})()`));
|
||||
assert.equal(r.mine, r.links, 'the same possible links');
|
||||
assert.ok(r.n > 2000);
|
||||
// Every 9th city against every 9th after it: over a thousand pairs, near and far, in all regions (each pair walks
|
||||
// every possible link the plain way, so all pairs took 90 s).
|
||||
assert.ok(r.n > 1000);
|
||||
assert.deepEqual(r.bad, [], JSON.stringify(st));
|
||||
}
|
||||
assert.deepEqual(errors, []);
|
||||
|
|
@ -41,7 +43,7 @@ test('link curves: skipping far-away cities gives the same bend around the ones
|
|||
const cand=[1,1.5,2.1,2.9,3.8].map(k=>lim(sg*mag*k)).concat([1,1.5,2.1,2.9,3.8].map(k=>lim(-sg*Math.max(mag,base)*k)));let best=null,bs=-Infinity;
|
||||
for(const off of cand){const cx=mx+nx*off,cy=my+ny*off,c=clear(cx,cy);if(c>=need){best=[cx,cy];break;}const sc=Math.min(c,need)-Math.abs(off)*0.35;if(sc>bs){bs=sc;best=[cx,cy];}}
|
||||
return {ax:A.x,ay:A.y,bx,by,cx:best[0],cy:best[1],len};}`);
|
||||
const bad = JSON.parse(ev(`(()=>{const ids=CITIES.map(c=>c.id),bad=[];for(let i=0;i<ids.length;i+=6)for(let j=i+1;j<ids.length;j+=5)for(const k of [0,1,4]){
|
||||
const bad = JSON.parse(ev(`(()=>{const ids=CITIES.map(c=>c.id),bad=[];for(let i=0;i<ids.length;i+=12)for(let j=i+1;j<ids.length;j+=10)for(const k of [0,1,4]){
|
||||
const l={id:'x'+i+'_'+j,a:ids[i],b:ids[j]};if(JSON.stringify(bezGeom(l,k))!==JSON.stringify(plainGeom(l,k)))bad.push(l.a+'-'+l.b+'#'+k);}return JSON.stringify(bad)})()`));
|
||||
assert.deepEqual(bad, []);
|
||||
assert.deepEqual(errors, []);
|
||||
|
|
|
|||
|
|
@ -105,14 +105,3 @@ test('old saves with inbox, max-prefix and Large Peering Model state load and pl
|
|||
assert.equal(ev('__o.pdeskRep'), null);
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test('max-prefix incidents can no longer fire', () => {
|
||||
const { ev, errors } = load();
|
||||
setup(ev);
|
||||
assert.equal(ev("failureRun.toString().includes('maxpfx')"), false);
|
||||
ev("S.day=100;const src=failureRun.toString().replace(/^function\* failureRun/,'function*').replace('let tot=opts.reduce',\"opts.splice(0,opts.length,['funny',1]);let tot=opts.reduce\");window.__ff=eval('('+src+')')");
|
||||
ev("__reseed(7);for(let i=0;i<200;i++){runNow(__ff());S.inc=S.inc.filter(x=>x.type!=='maxpfx'||(window.__mp=1,0));}");
|
||||
assert.equal(ev('!!window.__mp'), false);
|
||||
assert.equal(ev("typeof inboxDay+typeof ibx+typeof ACT.inboxRaiseAll+typeof ACT.inboxBot"), 'undefinedundefinedundefinedundefined');
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -127,23 +127,6 @@ test('launches fill crusts, the party is billed, heavy test flights explode', ()
|
|||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test('O5: launches only fail with chaos on, and never in the first 90 days', () => {
|
||||
const run = (after) => {
|
||||
const { ev } = load();
|
||||
won(ev); company(ev);
|
||||
ev(`S.day=S.pie.born+${after};Math.random=()=>0`); // the unluckiest dice there are
|
||||
ev("ACT.pieLaunch({rk:'falcon',cr:'short'});S.pie.q[0].day=S.day;pieDay(S.day)");
|
||||
return ev("pieLive('short')");
|
||||
};
|
||||
assert.equal(run(10), 20, 'quiet days');
|
||||
assert.equal(run(120), 0, 'chaos can lose a launch');
|
||||
const { ev } = load();
|
||||
sandbox(ev);
|
||||
company(ev);
|
||||
ev("S.day=500;S.pie.pads[0].next=0;Math.random=()=>0;ACT.pieLaunch({rk:'falcon',cr:'short'});S.pie.q[0].day=S.day;pieDay(S.day)");
|
||||
assert.equal(ev("pieLive('short')"), 20, 'chaos none: nothing fails');
|
||||
});
|
||||
|
||||
test('cohorts wear out over the end of their life, and a crust carries a share from 40%, all of it from 60%', () => {
|
||||
const { ev, errors } = load();
|
||||
won(ev);
|
||||
|
|
@ -186,7 +169,9 @@ test('promises slip a year and get broken', () => {
|
|||
won(ev);
|
||||
company(ev);
|
||||
assert.equal(ev('S.pie.founder.promises'), 1);
|
||||
ev('for(let i=0;i<361;i++)dayTick()');
|
||||
assert.ok(ev('S.pie.founder.due[0]-S.day') >= 359, 'due a year from the promise');
|
||||
// Then a year passes: rather than play 360 days, the due date moves to tomorrow.
|
||||
ev('S.pie.founder.due[0]=S.day+1;for(let i=0;i<2;i++)dayTick()');
|
||||
assert.equal(ev('S.pie.founder.broken'), 1);
|
||||
assert.ok(ev("S.pie.founder.posts.some(p=>p.k==='pie.fp_slip')"));
|
||||
assert.match(ev('pieFpText(S.pie.founder.posts[0])'), /\w/);
|
||||
|
|
|
|||
|
|
@ -166,11 +166,6 @@ test('F4: the chaos monkey snips a laser link while it visits, healed within a w
|
|||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
test('the booster that falls over on the drone ship is the foundation\'s', () => {
|
||||
const { ev } = load();
|
||||
assert.ok(ev("pieFly.toString().includes('fp_booster')"));
|
||||
});
|
||||
|
||||
test('sanitize drops orbit incidents that make no sense, and old saves are untouched', () => {
|
||||
const { ev, errors } = load();
|
||||
sky(ev);
|
||||
|
|
|
|||
|
|
@ -1021,7 +1021,8 @@ test('Down Under: routers upside down, BrisVegas, Next-Door-DC and everything tr
|
|||
assert.match(ev("siteName('bne','b')"), /^Next-Door-DC B[12]$/);
|
||||
assert.equal(ev("siteName('cbr','b')"), 'Next-Door-DC C1');
|
||||
// everything is trying to kill you: the new outages can come up on Australian links and POPs
|
||||
const src = ev("document.documentElement.innerHTML");
|
||||
// (The game's English text, where the outages are written; the page once carried it in its <script>.)
|
||||
const src = ev("JSON.stringify(I18N.en)");
|
||||
for (const s of ['drop bear', 'eastern brown snake', 'Magpie swooping', 'Box jellyfish', 'Vegemite as thermal paste', 'brought Marmite', 'four o’clock storm']) assert.ok(src.includes(s), s);
|
||||
assert.match(ev("ixName('syd~2')"), /At-The-Edge/); assert.match(ev("XIX.find(x=>x.id==='syd~2').blurb"), /Vegemite/);
|
||||
ev('cam.z=2;draw(0);cam.z=0.4;draw(0)');
|
||||
|
|
|
|||
|
|
@ -22,8 +22,10 @@ test('#157 a POP can grow past six routers, with a cage extension', () => {
|
|||
assert.equal(withCage - without, ev('ROUTER_MO+RG[S.pops.fra.rgen||0].mo+CAGE_MO'), 'the cage extension is billed monthly');
|
||||
ev("S.pops.fra.routers=7;compute()");
|
||||
assert.ok(ev('nodeCap("fra")') === ev('RG[S.pops.fra.rgen||0].cap*7'), 'every router adds forwarding');
|
||||
ev("UI.sel={k:'city',id:'fra'};renderAll()");
|
||||
assert.match(dom.window.document.body.innerHTML, /Cage extension/);
|
||||
// The routers live on the city's Infra tab. (Not the whole body: that once held the game's source, dictionary
|
||||
// and all, so a phrase was always found there.)
|
||||
ev("UI.sel={type:'city',id:'fra'};UI.tab='links';renderAll()");
|
||||
assert.match(dom.window.document.getElementById('panel').innerHTML, /Cage extension/);
|
||||
assert.deepEqual(errors, []);
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue