merge origin/main into feat/wf5-securestorage
Brings MOSAIC_GIT_IDENTITY (per-seat git authorship) onto the delivery branch, which had none of it. The branch carried W-F7's FLEET_SEAT seam in the same launcher file; the two auto-merged cleanly. Three single-hunk conflicts resolved: - pr-merge.sh: kept branch policy allowing main OR next (next is the release stream). - test-ci-queue-wait-tristate.sh: kept the branch's 4 added merge-readiness assertions; merge base and main both had zero, so nothing of main's is reverted. - package.json test:framework-shell: union of both enumerations, 50 entries, no test dropped from either side. Picks up main's test-start-agent-session.sh and test-fleet-units.sh, which are the guards for the identity key.
This commit is contained in:
@@ -245,9 +245,21 @@ describe('EnrollmentService.createToken', () => {
|
||||
const after = Date.now();
|
||||
|
||||
const expiresMs = new Date(result.expiresAt).getTime();
|
||||
// Should be at most 900s from now
|
||||
expect(expiresMs - before).toBeLessThanOrEqual(900_000 + 100);
|
||||
|
||||
// The property under test is CLAMPING: a 9999s request must come back as 900s.
|
||||
// The gap between clamped and unclamped is 9_099_000 ms, so the tolerance below
|
||||
// only has to exceed CI scheduling jitter — it does not need to be tight to keep
|
||||
// the assertion discriminating. A 5s allowance consumes 0.05% of that margin and
|
||||
// an unclamped result still misses by three orders of magnitude.
|
||||
//
|
||||
// It was 100ms and failed on a loaded agent at 900_106 — 6ms over (#1090). A
|
||||
// wall-clock budget sized to a fast machine is a flake, not a tighter test.
|
||||
const CI_JITTER_MS = 5_000;
|
||||
expect(expiresMs - before).toBeLessThanOrEqual(900_000 + CI_JITTER_MS);
|
||||
expect(expiresMs - after).toBeGreaterThanOrEqual(0);
|
||||
// Explicitly pin the clamp itself, independent of any timing allowance:
|
||||
// unclamped (9999s) would exceed this by ~9_099_000 ms.
|
||||
expect(expiresMs - before).toBeLessThan(1_000_000);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user