Skip to content

test(smoke): Isolate xcodebuild log capture #393

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
cameroncooke merged 1 commit into from
May 5, 2026
+17 −1
Merged

test(smoke): Isolate xcodebuild log capture #393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion src/smoke-tests/mcp-test-harness.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { existsSync } from 'node:fs';
import { resolve } from 'node:path';
import { mkdtemp, rm } from 'node:fs/promises';
import { join, resolve } from 'node:path';
import { tmpdir } from 'node:os';
import { pathToFileURL } from 'node:url';
import type { ChildProcess } from 'node:child_process';
import { Client } from '@modelcontextprotocol/sdk/client/index.js';
Expand Down Expand Up @@ -35,6 +37,7 @@ import {
} from '../utils/debugger/index.ts';
import { getPackageRoot } from '../core/manifest/load-manifest.ts';
import { shutdownXcodeToolsBridge } from '../integrations/xcode-tools-bridge/index.ts';
import { setXcodebuildLogDirOverrideForTests } from '../utils/xcodebuild-log-capture.ts';

export interface CapturedCommand {
command: string[];
Expand Down Expand Up @@ -100,6 +103,9 @@ export async function createMcpTestHarness(opts?: McpTestHarnessOptions): Promis
sessionStore.clear();

const mockFs = createMockFileSystemExecutor();
const logDir = await mkdtemp(join(tmpdir(), 'xcodebuildmcp-smoke-logs-'));

setXcodebuildLogDirOverrideForTests(logDir);

// Set executor overrides on the vitest-resolved source modules
__setTestCommandExecutorOverride(capturingExecutor);
Expand All @@ -125,6 +131,13 @@ export async function createMcpTestHarness(opts?: McpTestHarnessOptions): Promis
builtCommandModule.__setTestCommandExecutorOverride(capturingExecutor);
builtCommandModule.__setTestFileSystemExecutorOverride(mockFs);

const builtLogCaptureModule = (await import(
pathToFileURL(resolve(buildRoot, 'utils/xcodebuild-log-capture.js')).href
)) as {
setXcodebuildLogDirOverrideForTests: typeof setXcodebuildLogDirOverrideForTests;
};
builtLogCaptureModule.setXcodebuildLogDirOverrideForTests(logDir);

// Set interactive spawner override (built module)
const builtInteractiveModule = (await import(
pathToFileURL(resolve(buildRoot, 'utils/execution/interactive-process.js')).href
Expand Down Expand Up @@ -238,6 +251,9 @@ export async function createMcpTestHarness(opts?: McpTestHarnessOptions): Promis
builtInteractiveModule.__clearTestInteractiveSpawnerOverride();
__clearTestDebuggerToolContextOverride();
builtDebuggerModule.__clearTestDebuggerToolContextOverride();
setXcodebuildLogDirOverrideForTests(null);
builtLogCaptureModule.setXcodebuildLogDirOverrideForTests(null);
await rm(logDir, { recursive: true, force: true });
__resetConfigStoreForTests();
builtConfigStoreModule.__resetConfigStoreForTests();
__resetServerStateForTests();
Expand Down
Loading