test: remove nondeterministic test instrumentation

Author: bwachman

src/config/settings-lazy.test.ts

@@ -3,19 +3,14 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { expect, test } from "bun:test";
 
-import { schemaMaterializations } from "../schema/lazy.js";
-
-test("importing settings does not build schemas; a malformed file fails when read", async () => {
-  const before = schemaMaterializations();
+test("importing settings allows a malformed file to fail when read", async () => {
   const settings = await import("./settings.js");
-  expect(schemaMaterializations()).toBe(before);
 
   const dir = await mkdtemp(join(tmpdir(), "lazy-settings-"));
   try {
     const path = join(dir, "settings.json");
     await writeFile(path, JSON.stringify({ providers: "nope" }));
     await expect(settings.loadSettings(path)).rejects.toThrow();
-    expect(schemaMaterializations()).toBeGreaterThan(before);
   } finally {
     await rm(dir, { recursive: true, force: true });
   }

src/permission/approval-store-migration.test.ts

@@ -1,14 +1,7 @@
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import {
-  chmod,
-  mkdir,
-  mkdtemp,
-  readFile,
-  rm,
-  writeFile,
-} from "node:fs/promises";
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { dirname, join } from "node:path";
+import { join } from "node:path";
 import { installFileLogSink } from "../logging/sink.js";
 import { generateSessionId, sessionDir } from "../session/index.js";
 import { loadSeededApprovals } from "../session/runtime-assembly.js";
@@ -276,7 +269,7 @@ describe("migratePersistedApprovalStores", () => {
     expect(await readJson(projectStorePath())).toEqual({ approvals: [] });
   });
 
-  test("EACCES writing the backup leaves live bytes unchanged", async () => {
+  test("a backup write failure leaves live bytes unchanged", async () => {
     const path = sessionStorePath();
     const original = {
       approvals: [
@@ -286,16 +279,12 @@ describe("migratePersistedApprovalStores", () => {
     };
     await writeFile(path, JSON.stringify(original));
     const liveBytes = await readFile(path, "utf-8");
-    const dir = dirname(path);
-    await chmod(dir, 0o555);
-    try {
-      const result = await migratePersistedApprovalStores(cwd, sessionId, home);
-      expect(result.purged).toBe(0);
-      expect(result.backups).toEqual([]);
-      expect(await readFile(path, "utf-8")).toBe(liveBytes);
-    } finally {
-      await chmod(dir, 0o755);
-    }
+    await mkdir(`${backupPath(path)}.${process.pid}.tmp`);
+
+    const result = await migratePersistedApprovalStores(cwd, sessionId, home);
+    expect(result.purged).toBe(0);
+    expect(result.backups).toEqual([]);
+    expect(await readFile(path, "utf-8")).toBe(liveBytes);
   });
 
   test("per-file migration failures surface once as a single summary warn", async () => {
@@ -315,12 +304,10 @@ describe("migratePersistedApprovalStores", () => {
         approvals: [{ tool: "update_plan", pattern: "plan *" }],
       }),
     );
-    // Read-only store dirs make the backup step fail, so both stores skip
-    // untouched while the global path (absent) stays a clean no-op.
-    const sessionStoreDir = dirname(sessionStorePath());
-    const projectStoreDir = join(cwd, ".corbits");
-    await chmod(sessionStoreDir, 0o555);
-    await chmod(projectStoreDir, 0o555);
+    // Directory entries at the deterministic temp paths make both backup
+    // writes fail while the global path (absent) stays a clean no-op.
+    await mkdir(`${backupPath(sessionStorePath())}.${process.pid}.tmp`);
+    await mkdir(`${backupPath(projectStorePath())}.${process.pid}.tmp`);
     try {
       const result = await migratePersistedApprovalStores(cwd, sessionId, home);
       expect(result.purged).toBe(0);
@@ -333,7 +320,12 @@ describe("migratePersistedApprovalStores", () => {
 
       const lines = (await readFile(join(logDir, "corbits.log"), "utf8"))
         .split("\n")
-        .filter((line) => line.includes("Skipped approval-store migration"));
+        .filter(
+          (line) =>
+            line.includes("Skipped approval-store migration") &&
+            line.includes(sessionStorePath()) &&
+            line.includes(projectStorePath()),
+        );
       // One summary warn for the whole migration, not one per failing store.
       expect(lines).toHaveLength(1);
       const summary = lines[0];
@@ -342,8 +334,6 @@ describe("migratePersistedApprovalStores", () => {
       expect(summary).toContain(sessionStorePath());
       expect(summary).toContain(projectStorePath());
     } finally {
-      await chmod(sessionStoreDir, 0o755);
-      await chmod(projectStoreDir, 0o755);
       await rm(logDir, { recursive: true, force: true });
     }
   });

src/schema/lazy.ts

@@ -1,18 +1,10 @@
-let materializations = 0;
-
-/** How many memoized schemas have been built in this process. */
-export function schemaMaterializations(): number {
-  return materializations;
-}
-
 export function memoSchema<T>(build: () => T): () => T {
   let cached: T | undefined;
   let ready = false;
   return () => {
     if (!ready) {
       cached = build();
       ready = true;
-      materializations += 1;
     }
     return cached as T;
   };