smashimo/oh-my-pi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(test): migrate fs.rmSync to removeSyncWithRetries in 5 more test files

Browse Source 
Batch migration of 13 fs.rmSync calls to removeSyncWithRetries across:
- core/apply-patch.test.ts (4 calls)
- bash-executor.test.ts (4 calls)
- tools.test.ts (2 calls)
- compaction-hooks.test.ts (1 call)
- compaction-thinking-model.test.ts (2 calls)

Also exports removeSyncWithRetries from @oh-my-pi/pi-utils as a
standalone function for tests that manage their own temp dirs.

All tests pass: 139 pass, 0 fail across the 5 migrated files.
This commit is contained in:
oldschoola
2026-06-19 17:30:58 -07:00
parent 1a92b3f854
commit a436dfbbeb
7 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/coding-agent/test/bash-executor.test.ts
+5 -4
View File
@@ -8,6 +8,7 @@ import { DEFAULT_MAX_BYTES } from "@oh-my-pi/pi-coding-agent/session/streaming-o
import * as shellSnapshot from "@oh-my-pi/pi-coding-agent/utils/shell-snapshot";
import type { Shell } from "@oh-my-pi/pi-natives";
import * as piNatives from "@oh-my-pi/pi-natives";
import { removeSyncWithRetries } from "@oh-my-pi/pi-utils";
// Matches the schema default for `tools.artifactHeadBytes` (20 KB) used by
// OutputSink when bash-executor pulls settings via resolveOutputSinkHeadBytes.
@@ -72,7 +73,7 @@ describe("executeBash", () => {
resetSettingsForTest();
vi.restoreAllMocks();
if (fs.existsSync(tempDir)) {
fs.rmSync(tempDir, { recursive: true });
removeSyncWithRetries(tempDir);
}
});
@@ -201,7 +202,7 @@ exit 64
expect(result.output.trim()).toBe("shell-ok");
expect(fs.readFileSync(marker, "utf8")).toContain("-l -c");
} finally {
fs.rmSync(shellDir, { recursive: true, force: true });
removeSyncWithRetries(shellDir);
}
});
@@ -262,7 +263,7 @@ exit 64
} else {
Bun.env.SHELL = originalShell;
}
fs.rmSync(shellDir, { recursive: true, force: true });
removeSyncWithRetries(shellDir);
}
});
@@ -304,7 +305,7 @@ exit 64
expect(result.exitCode).toBe(0);
expect(result.output.trim()).toBe("zsh-alias-ok");
} finally {
fs.rmSync(shellDir, { recursive: true, force: true });
removeSyncWithRetries(shellDir);
}
});
packages/coding-agent/test/compaction-hooks.test.ts
+2 -2
View File
@@ -22,7 +22,7 @@ import { AgentSession } from "@oh-my-pi/pi-coding-agent/session/agent-session";
import { AuthStorage } from "@oh-my-pi/pi-coding-agent/session/auth-storage";
import { SessionManager } from "@oh-my-pi/pi-coding-agent/session/session-manager";
import { createTools, type ToolSession } from "@oh-my-pi/pi-coding-agent/tools";
import { Snowflake } from "@oh-my-pi/pi-utils";
import { removeSyncWithRetries, Snowflake } from "@oh-my-pi/pi-utils";
import { e2eApiKey } from "./utilities";
describe.skipIf(!e2eApiKey("ANTHROPIC_API_KEY"))("Compaction hooks", () => {
@@ -42,7 +42,7 @@ describe.skipIf(!e2eApiKey("ANTHROPIC_API_KEY"))("Compaction hooks", () => {
await session.dispose();
}
if (tempDir && fs.existsSync(tempDir)) {
fs.rmSync(tempDir, { recursive: true });
removeSyncWithRetries(tempDir);
}
});
packages/coding-agent/test/compaction-thinking-model.test.ts
+3 -3
View File
@@ -12,7 +12,7 @@ import { afterEach, beforeEach, describe } from "bun:test";
import * as fs from "node:fs";
import * as os from "node:os";
import * as path from "node:path";
import { Snowflake } from "@oh-my-pi/pi-utils";
import { removeSyncWithRetries, Snowflake } from "@oh-my-pi/pi-utils";
import { e2eApiKey } from "./utilities";
// Check for auth
@@ -36,7 +36,7 @@ describe.skipIf(!HAS_ANTIGRAVITY_AUTH)("Compaction with thinking models (Antigra
authStorage?.close();
authStorage = undefined;
if (tempDir && fs.existsSync(tempDir)) {
fs.rmSync(tempDir, { recursive: true });
removeSyncWithRetries(tempDir);
}
});
});
@@ -61,7 +61,7 @@ describe.skipIf(!HAS_ANTHROPIC_AUTH)("Compaction with thinking models (Anthropic
authStorage?.close();
authStorage = undefined;
if (tempDir && fs.existsSync(tempDir)) {
fs.rmSync(tempDir, { recursive: true });
removeSyncWithRetries(tempDir);
}
});
});
packages/coding-agent/test/core/apply-patch.test.ts
+5 -4
View File
@@ -11,6 +11,7 @@ import {
parseDiffHunks,
seekSequence,
} from "@oh-my-pi/pi-coding-agent/edit";
import { removeSyncWithRetries } from "@oh-my-pi/pi-utils";
// ═══════════════════════════════════════════════════════════════════════════
// Test-local adapters over the production Codex envelope API.
@@ -215,7 +216,7 @@ describe("apply-patch scenarios", () => {
afterEach(() => {
try {
fs.rmSync(tempDir, { recursive: true, force: true });
removeSyncWithRetries(tempDir);
} catch {
// Ignore cleanup errors
}
@@ -303,7 +304,7 @@ describe("applyPatch", () => {
afterEach(() => {
try {
fs.rmSync(tempDir, { recursive: true, force: true });
removeSyncWithRetries(tempDir);
} catch {
// Ignore cleanup errors
}
@@ -458,7 +459,7 @@ describe("simple replace mode", () => {
afterEach(() => {
try {
fs.rmSync(tempDir, { recursive: true, force: true });
removeSyncWithRetries(tempDir);
} catch {
// Ignore cleanup errors
}
@@ -634,7 +635,7 @@ describe("applyCodexPatch (production)", () => {
afterEach(() => {
try {
fs.rmSync(tempDir, { recursive: true, force: true });
removeSyncWithRetries(tempDir);
} catch {
// ignore
}
packages/coding-agent/test/tools.test.ts
+3 -3
View File
@@ -19,7 +19,7 @@ import { DEFAULT_FILE_LIMIT, MULTI_FILE_PER_FILE_MATCHES, SearchTool } from "@oh
import * as toolTimeouts from "@oh-my-pi/pi-coding-agent/tools/tool-timeouts";
import { WriteTool } from "@oh-my-pi/pi-coding-agent/tools/write";
import { unzip } from "@oh-my-pi/pi-coding-agent/utils/zip";
import { $which, Snowflake } from "@oh-my-pi/pi-utils";
import { $which, removeSyncWithRetries, Snowflake } from "@oh-my-pi/pi-utils";
// Helper to extract text from content blocks
function getTextOutput(result: any): string {
@@ -302,7 +302,7 @@ describe("Coding Agent Tools", () => {
vi.restoreAllMocks();
// Clean up test directory
fs.rmSync(testDir, { recursive: true, force: true });
removeSyncWithRetries(testDir);
// Restore original edit variant
if (originalEditVariant === undefined) {
@@ -2134,7 +2134,7 @@ describe("edit tool CRLF handling", () => {
});
afterEach(() => {
fs.rmSync(testDir, { recursive: true, force: true });
removeSyncWithRetries(testDir);
// Restore original edit variant
if (originalEditVariant === undefined) {
packages/utils/CHANGELOG.md
+4
View File
@@ -2,6 +2,10 @@
## [Unreleased]
### Added
- Exported `removeSyncWithRetries()` as a standalone function so tests that manage their own temp dirs can use the same retry-on-EBUSY cleanup logic as `TempDir.removeSync()`.
## [16.1.3] - 2026-06-19
### Changed
packages/utils/src/temp.ts
+1 -1
View File
@@ -95,7 +95,7 @@ async function removeWithRetries(target: string): Promise<void> {
}
}
function removeSyncWithRetries(target: string): void {
export function removeSyncWithRetries(target: string): void {
for (let attempt = 0; ; attempt++) {
try {
fs.rmSync(target, kRemoveOptions);