Skip to content

test: fix config-root seed and macOS history-probe fixtures after #7903/#7900 #7914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lidge-jun merged 2 commits into from
Oct 28, 2026
Merged

test: fix config-root seed and macOS history-probe fixtures after #7903/#7900 #7914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4df7e8e
test: stub the owner-ACL verifier in mocked config-root fixtures and …
lidge-jun Oct 28, 2026
63861c1
Merge remote-tracking branch 'origin/dev' into fix/ci-acl-verifier-an…
lidge-jun Oct 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions tests/claude-integration/claude-config-root-late-admission.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { inspectDesktop3pConfigLibrary, writeDesktop3pConfig } from "../../src/c
import { resolveDesktop3pConfigLibraryPath } from "../../src/claude/desktop-3p-library";
import { resetHardenedStateForTests, setAsyncIcaclsBeltSchedulerForTests, setAsyncIcaclsRunnerForTests, setIcaclsRunnerForTests, setNowForTests, setPlatformForTests, windowsSecretAclReapPendingForPath, type IcaclsResult } from "../../src/lib/windows-secret-acl";
import { setSyntheticWindowsPrincipalForTests } from "../../src/lib/windows-user-principal";
import { setWindowsOwnerAclRunnerForTests } from "../../src/lib/windows-owner-acl";
import { writeServiceApiTokenFile } from "../../src/lib/service-secrets";
import type { OcxConfig } from "../../src/types";
import { removeTreeWithRetry } from "../helpers/remove-tree";
Expand Down Expand Up @@ -52,6 +53,9 @@ beforeEach(() => {
setPlatformForTests("win32");
setSyntheticWindowsPrincipalForTests("*S-1-5-21-1-2-3-1001");
setIcaclsRunnerForTests(() => success);
// icacls is mocked, so the real PowerShell owner check must not decide hardening:
// a cold probe can exhaust the 1s ACL budget and refuse before the mocked icacls runs.
setWindowsOwnerAclRunnerForTests(() => ({ success: false, timedOut: false, stdout: "" }));
});
afterEach(async () => {
await paths.flushConfigDirHardeningAndReaps(root);
Expand All @@ -61,6 +65,7 @@ afterEach(async () => {
setAsyncIcaclsBeltSchedulerForTests(null);
setNowForTests(null);
setIcaclsRunnerForTests(null);
setWindowsOwnerAclRunnerForTests(null);
setLocalCaWindowsAclRunnerForTests(null);
setPlatformForTests(null);
setSyntheticWindowsPrincipalForTests(null);
Expand Down
5 changes: 5 additions & 0 deletions tests/claude-integration/claude-config-root-writer-barrier.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { inspectDesktop3pConfigLibrary, removeDesktop3pStandardPivot, writeDeskt
import { resolveDesktop3pConfigLibraryPath } from "../../src/claude/desktop-3p-library";
import { resetHardenedStateForTests, setAsyncIcaclsBeltSchedulerForTests, setAsyncIcaclsRunnerForTests, setIcaclsRunnerForTests, setNowForTests, setPlatformForTests, windowsSecretAclReapPendingForPath, type IcaclsResult } from "../../src/lib/windows-secret-acl";
import { setSyntheticWindowsPrincipalForTests } from "../../src/lib/windows-user-principal";
import { setWindowsOwnerAclRunnerForTests } from "../../src/lib/windows-owner-acl";
import { writeServiceApiTokenFile } from "../../src/lib/service-secrets";
import type { OcxConfig } from "../../src/types";
import { removeTreeWithRetry } from "../helpers/remove-tree";
Expand Down Expand Up @@ -44,6 +45,9 @@ beforeEach(() => {
setPlatformForTests("win32");
setSyntheticWindowsPrincipalForTests("*S-1-5-21-1-2-3-1001");
setIcaclsRunnerForTests(() => success);
// icacls is mocked, so the real PowerShell owner check must not decide hardening:
// a cold probe can exhaust the 1s ACL budget and refuse before the mocked icacls runs.
setWindowsOwnerAclRunnerForTests(() => ({ success: false, timedOut: false, stdout: "" }));
});
afterEach(async () => {
await paths.flushConfigDirHardeningAndReaps(root);
Expand All @@ -53,6 +57,7 @@ afterEach(async () => {
setAsyncIcaclsBeltSchedulerForTests(null);
setNowForTests(null);
setIcaclsRunnerForTests(null);
setWindowsOwnerAclRunnerForTests(null);
setLocalCaWindowsAclRunnerForTests(null);
setPlatformForTests(null);
setSyntheticWindowsPrincipalForTests(null);
Expand Down
3 changes: 2 additions & 1 deletion tests/fixtures/stop-restore-history-runner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ writeFileSync(backup, JSON.stringify({ version: 1, stateDbPath: canonicalDb, ent
const lockChecks: { phase: string; config: boolean; history: boolean }[] = [];
if (mode === "sync" && ownership === "standalone") {
const identity = await import("../../src/codex/user-identity");
const historyLockPath = identity.resolveCodexHistorySerializationDatabasePath(identity.resolveEffectiveUserIdentity(), codex, canonicalDb);
// Production locks the canonical CODEX_HOME spelling; macOS temp aliases (/var vs /private/var) hash differently.
const historyLockPath = identity.resolveCodexHistorySerializationDatabasePath(identity.resolveEffectiveUserIdentity(), realpathSync.native(codex), canonicalDb);
function held(path: string): boolean {
const probe = new Database(path);
try { probe.exec("PRAGMA busy_timeout = 0; BEGIN IMMEDIATE; ROLLBACK"); return false; }
Expand Down
Loading