The windows-test-parity ratchet greps test source for fs.rmSync-without-
maxRetries (and six other Windows-portability anti-patterns), failing when an
integer offender COUNT exceeds a frozen baseline (rmSync: 95). A count ratchet
is a Goodhart metric: fixing one offender and adding another keeps the count
constant, so a new defect slips through green. Replace it — and every other
count ratchet in the repo — with a layered, masking-proof design.
Behavioral seam test
- tests/helpers-cleanup.test.cjs proves helpers.cleanup() carries the Windows
EBUSY retry budget. cleanup() delegates retries to Node's fs.rmSync via
maxRetries (it owns no loop), so the test asserts the option contract
(recursive/force/maxRetries>0/retryDelay>0) + real-FS removal + the cwd-guard,
rather than a loop that does not exist. The EBUSY risk is now tested ONCE at
the helper, not approximated textually at every call site.
Write-time ESLint rule (AST-accurate, replaces the grep)
- eslint-rules/no-raw-rmsync-in-tests.cjs (error in tests/**/*.test.cjs) bans
raw fs.rmSync, steering to cleanup(). Catches member, computed (fs['rmSync']),
destructured and aliased forms; escape hatch is inline
`// eslint-disable-next-line local/no-raw-rmsync-in-tests -- <reason>` only.
- Migrated 336 raw fs.rmSync teardown calls across ~116 test files to cleanup().
~18 genuinely load-bearing sites (mid-test SUT/fault-injection removals,
error-swallowing or name-colliding local teardown helpers) keep the raw call
with an inline eslint-disable + reason.
Shared anti-ratchet primitive
- scripts/lib/allowlist-ratchet.cjs:
- assertWithinAllowlist: fails on NOVEL ids (new offender introduced) AND on
STALE ids (a known offender was fixed but not pruned) — identity, not count,
and a ratchet DOWN toward zero.
- assertTightCeiling: a size/length budget whose ceiling must stay within a
grace band of the high-water mark, so budgets may only tighten, never creep.
Ratchets converted onto the primitive
- windows-test-parity-guard.test.cjs: rmSync rule deleted (now ESLint-enforced);
the remaining six patterns moved from integer baselines to named-set
allowlists with ratchet-down.
- scripts/lint-test-file-count.{cjs,allowlist.json}: per-module integer counts →
named filename sets (closes the swap-a-file-keep-the-count blind spot); a
module dropping under cap now FAILS to force pruning its allowlist entry.
- enh-2790 skill-count `<= 63` → named skill allowlist (ratchets toward ~58).
Size budgets hardened (tighten-only)
- agent-size / workflow-size / feat-3039 help-tiered: ceilings lowered to the
current high-water mark and an assertTightCeiling anti-creep check added per
tier. Fixed external-contract limits (description ≤100 chars, agent ≤100 KB)
are intentionally left as-is — they are not grandfathered creeping budgets.
No user-facing behavior change (tests + tooling only); no USER_FACING_PREFIXES
touched, so no changeset fragment is required.
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
176 lines
7.9 KiB
JavaScript
176 lines
7.9 KiB
JavaScript
'use strict';
|
|
/**
|
|
* Tests for scripts/ci-rebase-check.cjs — Codex round 4 P1 regression.
|
|
*
|
|
* The root bug: run() used execFileSync with stdio:'inherit', which returns null
|
|
* on success. The caller checked `result !== null` to detect success, so the
|
|
* condition was ALWAYS false (null !== null === false) and every successful fetch
|
|
* fell through to the "failed after 3 attempts" exit-1 path.
|
|
*
|
|
* Fix: run() now returns true on success, false on failure, making the boolean
|
|
* check unambiguous regardless of the stdio mode.
|
|
*
|
|
* These tests exercise the run() logic in isolation via subprocess execution,
|
|
* verifying the sentinel behaviour rather than internal module state.
|
|
*/
|
|
|
|
const { describe, test } = require('node:test');
|
|
const assert = require('node:assert/strict');
|
|
const { spawnSync } = require('node:child_process');
|
|
const path = require('node:path');
|
|
const fs = require('node:fs');
|
|
const os = require('node:os');
|
|
|
|
const ROOT = path.resolve(__dirname, '..');
|
|
const SCRIPT = path.join(ROOT, 'scripts', 'ci-rebase-check.cjs');
|
|
const NODE = process.execPath;
|
|
const { cleanup } = require('./helpers.cjs');
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Helper: run a small inline Node snippet that requires the run() helper
|
|
// directly from the source (extracted via a thin wrapper).
|
|
//
|
|
// Because the script has top-level side-effects (git config calls), we cannot
|
|
// require() it. Instead we test the run() sentinel by embedding the function
|
|
// body verbatim in a one-shot subprocess.
|
|
// ---------------------------------------------------------------------------
|
|
|
|
function evalRunHelper(stmts) {
|
|
// Inline the exact fixed run() body so the test is tightly coupled to the
|
|
// contract, not some mock.
|
|
const code = `
|
|
'use strict';
|
|
const { execFileSync } = require('child_process');
|
|
function run(cmd, args, opts) {
|
|
try {
|
|
execFileSync(cmd, args, { stdio: 'inherit', ...opts });
|
|
return true;
|
|
} catch (e) {
|
|
return false;
|
|
}
|
|
}
|
|
${stmts}
|
|
`;
|
|
const r = spawnSync(NODE, ['-e', code], { encoding: 'utf8', timeout: 10_000 });
|
|
return { status: r.status ?? 1, stdout: r.stdout ?? '', stderr: r.stderr ?? '' };
|
|
}
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Test group 1 — run() sentinel correctness
|
|
// ---------------------------------------------------------------------------
|
|
|
|
describe('ci-rebase-check: run() helper — success sentinel (Codex round 4 P1)', () => {
|
|
|
|
test('run() returns true when the command succeeds', () => {
|
|
// Use `node -e ""` (no-op) as a guaranteed-success command that produces no output,
|
|
// avoiding stdout contamination when stdio:'inherit' writes to the same stream.
|
|
const { status, stdout, stderr } = evalRunHelper(`
|
|
const result = run(process.execPath, ['-e', '']);
|
|
process.stdout.write(String(result));
|
|
`);
|
|
assert.strictEqual(status, 0, `subprocess should exit 0; stderr: ${stderr}`);
|
|
assert.strictEqual(stdout, 'true', `run() must return true on success; got: ${stdout}`);
|
|
});
|
|
|
|
test('run() returns false when the command fails', () => {
|
|
// An invalid binary name causes execFileSync to throw ENOENT.
|
|
const { status, stdout, stderr } = evalRunHelper(`
|
|
const result = run('__nonexistent_binary_that_cannot_exist__', []);
|
|
process.stdout.write(String(result));
|
|
`);
|
|
assert.strictEqual(status, 0, `subprocess should exit 0; stderr: ${stderr}`);
|
|
assert.strictEqual(stdout, 'false', `run() must return false on failure; got: ${stdout}`);
|
|
});
|
|
|
|
test('run() returns true (not null) — counter-test for pre-fix null behaviour', () => {
|
|
// Pre-fix: execFileSync with stdio:'inherit' returns null on success.
|
|
// The old check was `result !== null`, which would be `null !== null === false`.
|
|
// Post-fix: result must be strictly true, making `if (result)` correct.
|
|
// Use `node -e ""` (no-op) so stdio:'inherit' does not pollute our stdout capture.
|
|
const { status, stdout } = evalRunHelper(`
|
|
const result = run(process.execPath, ['-e', '']);
|
|
process.stdout.write(JSON.stringify({ isTrue: result === true, isNull: result === null }));
|
|
`);
|
|
assert.strictEqual(status, 0);
|
|
const { isTrue, isNull } = JSON.parse(stdout);
|
|
assert.strictEqual(isNull, false, 'run() must NOT return null on success (pre-fix bug)');
|
|
assert.strictEqual(isTrue, true, 'run() must return exactly true on success');
|
|
});
|
|
|
|
test('run() returns false (not null) — failure path also returns boolean', () => {
|
|
const { status, stdout } = evalRunHelper(`
|
|
const result = run('__nonexistent__', []);
|
|
process.stdout.write(JSON.stringify({ isFalse: result === false, isNull: result === null }));
|
|
`);
|
|
assert.strictEqual(status, 0);
|
|
const { isFalse, isNull } = JSON.parse(stdout);
|
|
assert.strictEqual(isNull, false, 'run() must NOT return null on failure');
|
|
assert.strictEqual(isFalse, true, 'run() must return exactly false on failure');
|
|
});
|
|
|
|
});
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// Test group 2 — fetch-retry loop uses the boolean correctly
|
|
//
|
|
// We cannot run the actual git fetch against GitHub in unit tests, but we can
|
|
// verify the fetch-loop logic by running the full script against a local git
|
|
// repo where GITHUB_TOKEN and GITHUB_REPOSITORY are absent (so remote set-url
|
|
// is skipped) and GITHUB_BASE_REF points to a branch that exists locally.
|
|
// ---------------------------------------------------------------------------
|
|
|
|
describe('ci-rebase-check: fetch-retry loop resolves when git fetch succeeds', () => {
|
|
|
|
test('script exits 0 when fetch succeeds (local bare remote, clean merge)', () => {
|
|
// Set up: create a temp dir with a local git repo that has a `main` branch.
|
|
// The script will fetch `origin main` from this local "remote".
|
|
const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'gsd-431-ci-rebase-'));
|
|
const remoteDir = path.join(tmpDir, 'remote.git');
|
|
const workDir = path.join(tmpDir, 'work');
|
|
|
|
try {
|
|
// Build a bare remote with a `main` branch containing one commit.
|
|
fs.mkdirSync(remoteDir, { recursive: true });
|
|
spawnSync('git', ['init', '--bare', remoteDir], { encoding: 'utf8' });
|
|
|
|
// Create a working clone to push an initial commit.
|
|
spawnSync('git', ['clone', remoteDir, workDir], { encoding: 'utf8' });
|
|
fs.writeFileSync(path.join(workDir, 'seed.txt'), 'init\n');
|
|
spawnSync('git', ['-C', workDir, 'config', 'user.email', 'ci@test'], { encoding: 'utf8' });
|
|
spawnSync('git', ['-C', workDir, 'config', 'user.name', 'CI Test'], { encoding: 'utf8' });
|
|
spawnSync('git', ['-C', workDir, 'checkout', '-b', 'main'], { encoding: 'utf8' });
|
|
spawnSync('git', ['-C', workDir, 'add', 'seed.txt'], { encoding: 'utf8' });
|
|
spawnSync('git', ['-C', workDir, 'commit', '-m', 'init'], { encoding: 'utf8' });
|
|
spawnSync('git', ['-C', workDir, 'push', 'origin', 'main'], { encoding: 'utf8' });
|
|
|
|
// Run the script from `workDir` with origin pointing at our bare remote.
|
|
// GITHUB_BASE_REF=main so it fetches `origin main`.
|
|
// No GITHUB_TOKEN so remote set-url is skipped.
|
|
const r = spawnSync(NODE, [SCRIPT], {
|
|
cwd: workDir,
|
|
encoding: 'utf8',
|
|
timeout: 20_000,
|
|
env: {
|
|
...process.env,
|
|
GITHUB_BASE_REF: 'main',
|
|
GITHUB_TOKEN: '',
|
|
GITHUB_REPOSITORY: '',
|
|
},
|
|
});
|
|
|
|
assert.strictEqual(
|
|
r.status, 0,
|
|
`Script should exit 0 when fetch+merge succeed.\nstdout: ${r.stdout}\nstderr: ${r.stderr}`
|
|
);
|
|
// Must NOT emit the "failed after 3 attempts" error message.
|
|
assert.ok(
|
|
!(r.stderr || '').includes('failed after 3 attempts'),
|
|
`Script must not emit "failed after 3 attempts" when fetch succeeded.\nstderr: ${r.stderr}`
|
|
);
|
|
} finally {
|
|
cleanup(tmpDir);
|
|
}
|
|
});
|
|
|
|
});
|