Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
39 changes: 23 additions & 16 deletions packages/acp-server/test/e2e-turn.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,21 @@ const STDIO_MCP_FIXTURE = fileURLToPath(
new URL('../../agent-core-v2/test/mcpCore/fixtures/mock-stdio-server.mjs', import.meta.url),
);

/**
* Best-effort recursive removal of a test's temp home dir. `fs.rm`'s
* recursive cleanup can transiently ENOTEMPTY/EBUSY right after a file
* handle (or, for the MCP-fixture tests, a child process pipe) in the
* directory closes but the OS hasn't fully released the deletion yet.
* Retry with Node's own linear-backoff defaults. Always returns `undefined`
* so call sites can just reassign: `homeDir = await cleanupHomeDir(homeDir);`.
*/
async function cleanupHomeDir(homeDir: string | undefined): Promise<string | undefined> {
if (homeDir !== undefined) {
await rm(homeDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
}
return undefined;
}

describe('acp-server real prompt turn (scripted LLM)', () => {
let homeDir: string | undefined;
let client: TestClient | undefined;
Expand All @@ -39,10 +54,8 @@ describe('acp-server real prompt turn (scripted LLM)', () => {
await client.close();
client = undefined;
}
if (homeDir !== undefined) {
await rm(homeDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
homeDir = undefined;
}

homeDir = await cleanupHomeDir(homeDir);
});

function installTerminalClient(c: TestClient): void {
Expand Down Expand Up @@ -578,10 +591,8 @@ describe('acp-server prompt error hygiene', () => {
await client.close();
client = undefined;
}
if (homeDir !== undefined) {
await rm(homeDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
homeDir = undefined;
}

homeDir = await cleanupHomeDir(homeDir);
});

it('a launch failure settles as a fixed internalError and never leaks the engine message', async () => {
Expand Down Expand Up @@ -625,10 +636,8 @@ describe('acp-server builtin slash commands (local execution, no LLM turn)', ()
await client.close();
client = undefined;
}
if (homeDir !== undefined) {
await rm(homeDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
homeDir = undefined;
}

homeDir = await cleanupHomeDir(homeDir);
});

async function boot(): Promise<TestClient> {
Expand Down Expand Up @@ -842,10 +851,8 @@ describe('acp-server terminal reverse-RPC (clientCapabilities.terminal)', () =>
await client.close();
client = undefined;
}
if (homeDir !== undefined) {
await rm(homeDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
homeDir = undefined;
}

homeDir = await cleanupHomeDir(homeDir);
});

interface FakeTerminal {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ describe('config manifest', () => {
const expected = await buildConfigManifest();
const actual = readFileSync(MANIFEST_PATH, 'utf-8');
expect(actual).toBe(expected);
}, 60_000);
}, 120_000);
});
2 changes: 1 addition & 1 deletion packages/agent-core-v2/test/wire/wireManifest.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ describe('wire manifest', () => {
const expected = await buildWireManifest();
const actual = readFileSync(MANIFEST_PATH, 'utf-8');
expect(actual).toBe(expected);
}, 60_000);
}, 120_000);

it('docs/wire-manifest.d.ts parses as TypeScript', () => {
const project = new Project({ useInMemoryFileSystem: true });
Expand Down
Loading