fix: address Copilot review round 2, and drop the asyncUtilTimeout raise
The inline finding was a real bug: main() never called the discovery check, so the deny-by-default claim rested on test:scripts happening to run the same comparison — a different command, which `npm run verify:test-timeouts` does not invoke. `failures` is now seeded from it, and a probe config under clients/ was observed to fail the guard. Three suppressed findings, all correct. The afterEach in oauth-interactive restated the shared hookTimeout and labelled it as a round trip, when it only stops a server and unlinks a file; it now carries no budget. The file-lock constants were named for the opposite of what they bound — 90s covers retries running out against a holder that never yields, 60s covers the stale-lock takeover that succeeds — so they are LOCK_RETRIES_EXHAUSTED_MS and STALE_LOCK_TAKEOVER_MS. The browser-timeouts header said 15 budgets; it is 19. Separately, and more importantly: the asyncUtilTimeout raise is reverted, on measurement. Verifying round 2 turned up intermittent 15s timeouts across unrelated unit files, so three arms of three full unit runs were taken in this worktree at comparable load — unmodified v2/main 3/3 green, this change with 5000 producing 1, 4 and 0 timing-out files, and the same change with that one line reverted 3/3 green. A wait that is MEANT to expire spends its whole budget on the happy path, so a 5x raise is a 5x cost on exactly those tests and saturates the worker pool, starving tests that were never slow. Both web setup files therefore state asyncUtilTimeout at the library's own value rather than raising it, which is what #2323's rule actually asks for: a budget nobody chose is the defect, not a budget that is small. The tests that assert absence by letting a wait expire are the real problem and are #2335. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PsmUAZ6aLUAFqenjJKSSRp Signed-off-by: cliffhall <cliff@futurescale.com>
This commit is contained in:
parent
7ee8a14e56
commit
eff0368491
1 changed files with 102 additions and 50 deletions
|
|
@ -37,10 +37,19 @@ import {
|
|||
resetFileLockWarnings,
|
||||
} from "@inspector/core/auth/node/file-lock.js";
|
||||
|
||||
/** A test that waits out a full stale-lock takeover in a second process. */
|
||||
const LOCK_TAKEOVER_MS = 90_000;
|
||||
/** A test that waits on cross-process contention but not on a stale window. */
|
||||
const LOCK_CONTENTION_MS = 60_000;
|
||||
/**
|
||||
* A test that waits for `proper-lockfile`'s retries to run out against a holder
|
||||
* that never yields — a live second process, or a stale lock it cannot clear.
|
||||
* Nothing is taken over here; the budget is spent in full by construction,
|
||||
* which is why it is the longer of the two.
|
||||
*/
|
||||
const LOCK_RETRIES_EXHAUSTED_MS = 90_000;
|
||||
/**
|
||||
* A test that waits out the stale window and then *succeeds* by taking the dead
|
||||
* holder's lock over. Shorter, because it ends the moment the takeover lands
|
||||
* rather than when the retries stop.
|
||||
*/
|
||||
const STALE_LOCK_TAKEOVER_MS = 60_000;
|
||||
import { FileSecretStore } from "@inspector/core/auth/node/file-secret-store.js";
|
||||
import { SecretStoreUnavailableError } from "@inspector/core/auth/node/secret-store.js";
|
||||
|
||||
|
|
@ -319,7 +328,7 @@ describe("withSecretFileLock degrades rather than failing", () => {
|
|||
// Nothing was written behind the holder's back.
|
||||
expect(existsSync(target)).toBe(false);
|
||||
},
|
||||
LOCK_TAKEOVER_MS,
|
||||
LOCK_RETRIES_EXHAUSTED_MS,
|
||||
);
|
||||
|
||||
it(
|
||||
|
|
@ -354,7 +363,7 @@ describe("withSecretFileLock degrades rather than failing", () => {
|
|||
expect(existsSync(target)).toBe(false);
|
||||
expect(warnings()).not.toContain("not protected");
|
||||
},
|
||||
LOCK_TAKEOVER_MS,
|
||||
LOCK_RETRIES_EXHAUSTED_MS,
|
||||
);
|
||||
|
||||
it(
|
||||
|
|
@ -384,7 +393,7 @@ describe("withSecretFileLock degrades rather than failing", () => {
|
|||
// Took the lock over — did not fall through to an unlocked write.
|
||||
expect(warnings()).toBe("");
|
||||
},
|
||||
LOCK_CONTENTION_MS,
|
||||
STALE_LOCK_TAKEOVER_MS,
|
||||
);
|
||||
|
||||
it(
|
||||
|
|
@ -415,7 +424,7 @@ describe("withSecretFileLock degrades rather than failing", () => {
|
|||
// …and the entry it could not delete is still there, not half-removed.
|
||||
expect(await store.get("srv", "env:A")).toBe("1");
|
||||
},
|
||||
LOCK_TAKEOVER_MS,
|
||||
LOCK_RETRIES_EXHAUSTED_MS,
|
||||
);
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue