Skip to content

Commit 9e623ba

Browse files
committed
refactor(ios-runner): put back a legacy XCTestDevices redirect once, at daemon startup
The restore ran on every simulator runner start and reached the session through a runner-xctestrun re-export. It is now one daemon-startup step on the platform owner lifecycle, after daemon.log publication. Without a device to compare against, it removes any symlink at XCTestDevices, as released versions did on every scoped runner start, and restores the agent-device backup. Each repair and any failure is recorded in daemon.log; a failure stops neither the daemon nor a runner start, because the runner no longer reads XCTestDevices.
1 parent 52eae1b commit 9e623ba

19 files changed

Lines changed: 180 additions & 129 deletions

‎packages/platform-apple/src/runner-operations-facade.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export {
1717
verifyLeaseRunnerPidIdentity,
1818
} from './core/runner-client.ts';
1919
export { queryAppleRunnerSelector } from './core/runner-selector-query.ts';
20+
export { restoreLegacyXctestDeviceSetRedirect } from './runner/runner-device-set.ts';
2021

2122
export async function cleanupRunnerLeasesForOwner(
2223
owner: Parameters<(typeof import('./core/runner-client.ts'))['cleanupRunnerLeasesForOwner']>[0],

‎packages/platform-apple/src/runner/__tests__/runner-close-finalization.test.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import {
3838
// capabilities behind the package's runner host port (`scripts/vitest-apple-runner-host-setup.ts`).
3939

4040
const {
41-
mockRestoreLegacyXctestDeviceSetRedirect,
4241
mockCleanupTempFile,
4342
mockEnsureXctestrunArtifact,
4443
mockGetFreePort,
@@ -57,7 +56,6 @@ const {
5756
mockSignalProcessGroupBestEffort,
5857
mockWaitForRunner,
5958
} = vi.hoisted(() => ({
60-
mockRestoreLegacyXctestDeviceSetRedirect: vi.fn(),
6159
mockCleanupTempFile: vi.fn(),
6260
mockEnsureXctestrunArtifact: vi.fn(),
6361
mockGetFreePort: vi.fn(),
@@ -112,7 +110,6 @@ vi.mock('../runner-xctestrun.ts', async () => {
112110
await vi.importActual<typeof import('../runner-xctestrun.ts')>('../runner-xctestrun.ts');
113111
return {
114112
...actual,
115-
restoreLegacyXctestDeviceSetRedirect: mockRestoreLegacyXctestDeviceSetRedirect,
116113
ensureXctestrunArtifact: mockEnsureXctestrunArtifact,
117114
prepareXctestrunWithEnv: mockPrepareXctestrunWithEnv,
118115
resolveExpectedRunnerCacheMetadata: mockResolveExpectedRunnerCacheMetadata,

‎packages/platform-apple/src/runner/__tests__/runner-device-set.test.ts‎

Lines changed: 37 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { afterEach, beforeEach, test, vi } from 'vitest';
55
import { resetAllProcessMemosForTests } from '@agent-device/kernel/ttl-memo';
66
import { IOS_DEVICE, IOS_SIMULATOR, TVOS_SIMULATOR } from './device-fixtures.ts';
77
import { mkdtempForTestSync } from './tmp-dir.ts';
8+
import { appleRunnerTestHost } from '../test-host.ts';
89
import { STUBBED_APPLE_TOOLCHAIN, stubAppleToolchainProbes } from './apple-toolchain-fixtures.ts';
910
import {
1011
isSameRunnerSimulator,
@@ -108,84 +109,71 @@ test('an older redirect is undone: the symlink goes and the host set comes back'
108109
const paths = makeLegacyPaths();
109110
fs.mkdirSync(path.join(paths.backupPath, 'HOST-UDID'), { recursive: true });
110111
fs.symlinkSync(paths.scopedSetPath, paths.xctestDeviceSetPath, 'dir');
112+
const phases = recordDiagnosticPhases();
111113

112-
restoreLegacyXctestDeviceSetRedirect(IOS_SIMULATOR, paths.xctestDeviceSetPath);
114+
restoreLegacyXctestDeviceSetRedirect(paths.xctestDeviceSetPath);
113115

114116
assert.equal(fs.lstatSync(paths.xctestDeviceSetPath).isSymbolicLink(), false);
115117
assert.ok(fs.existsSync(path.join(paths.xctestDeviceSetPath, 'HOST-UDID')));
116118
assert.equal(fs.existsSync(paths.backupPath), false);
117119
// Unlinking never follows the link: the scoped set it pointed at keeps its devices.
118120
assert.ok(fs.existsSync(path.join(paths.scopedSetPath, 'SCOPED-UDID')));
121+
assert.deepEqual(phases, [
122+
'ios_runner_legacy_xctest_device_set_link_removed',
123+
'ios_runner_legacy_xctest_device_set_backup_restored',
124+
]);
119125
});
120126

121-
test('a symlink an older redirect left into this scoped set without a backup is removed', () => {
122-
const paths = makeLegacyPaths();
123-
fs.symlinkSync(paths.scopedSetPath, paths.xctestDeviceSetPath, 'dir');
124-
125-
restoreLegacyXctestDeviceSetRedirect(
126-
{ ...IOS_SIMULATOR, simulatorSetPath: paths.scopedSetPath },
127-
paths.xctestDeviceSetPath,
128-
);
129-
130-
assert.equal(fs.lstatSync(paths.xctestDeviceSetPath, { throwIfNoEntry: false }), undefined);
131-
assert.ok(fs.existsSync(path.join(paths.scopedSetPath, 'SCOPED-UDID')));
132-
});
133-
134-
test('a host-owned XCTestDevices symlink with no backup survives a default-set startup', () => {
135-
const paths = makeLegacyPaths();
136-
fs.symlinkSync(paths.scopedSetPath, paths.xctestDeviceSetPath, 'dir');
137-
138-
restoreLegacyXctestDeviceSetRedirect(IOS_SIMULATOR, paths.xctestDeviceSetPath);
139-
140-
assert.equal(fs.readlinkSync(paths.xctestDeviceSetPath), paths.scopedSetPath);
141-
});
142-
143-
test('a host-owned XCTestDevices symlink elsewhere survives a scoped-set startup', () => {
144-
const paths = makeLegacyPaths();
145-
const external = path.join(path.dirname(paths.scopedSetPath), 'external-volume');
146-
fs.mkdirSync(external);
147-
fs.symlinkSync(external, paths.xctestDeviceSetPath, 'dir');
127+
test('a symlink an older redirect left without a backup is removed, whatever it points at', () => {
128+
for (const target of ['scoped', 'external'] as const) {
129+
const paths = makeLegacyPaths();
130+
const linkTarget =
131+
target === 'scoped'
132+
? paths.scopedSetPath
133+
: path.join(path.dirname(paths.scopedSetPath), 'external-volume');
134+
fs.mkdirSync(linkTarget, { recursive: true });
135+
fs.symlinkSync(linkTarget, paths.xctestDeviceSetPath, 'dir');
148136

149-
restoreLegacyXctestDeviceSetRedirect(
150-
{ ...IOS_SIMULATOR, simulatorSetPath: paths.scopedSetPath },
151-
paths.xctestDeviceSetPath,
152-
);
137+
restoreLegacyXctestDeviceSetRedirect(paths.xctestDeviceSetPath);
153138

154-
assert.equal(fs.readlinkSync(paths.xctestDeviceSetPath), external);
139+
assert.equal(fs.lstatSync(paths.xctestDeviceSetPath, { throwIfNoEntry: false }), undefined);
140+
assert.ok(fs.existsSync(linkTarget), target);
141+
}
155142
});
156143

157144
test('a backup never replaces a host set that is already in place', () => {
158145
const paths = makeLegacyPaths();
159146
fs.mkdirSync(path.join(paths.xctestDeviceSetPath, 'CURRENT-UDID'), { recursive: true });
160147
fs.mkdirSync(path.join(paths.backupPath, 'OLD-UDID'), { recursive: true });
161148

162-
restoreLegacyXctestDeviceSetRedirect(IOS_SIMULATOR, paths.xctestDeviceSetPath);
149+
restoreLegacyXctestDeviceSetRedirect(paths.xctestDeviceSetPath);
163150

164151
assert.ok(fs.existsSync(path.join(paths.xctestDeviceSetPath, 'CURRENT-UDID')));
165152
assert.ok(fs.existsSync(path.join(paths.backupPath, 'OLD-UDID')));
166153
});
167154

168-
test('a host with no leftovers is left untouched', () => {
155+
test('a host with no leftovers is left untouched and reports nothing', () => {
169156
const paths = makeLegacyPaths();
157+
const phases = recordDiagnosticPhases();
170158

171-
restoreLegacyXctestDeviceSetRedirect(IOS_SIMULATOR, paths.xctestDeviceSetPath);
159+
restoreLegacyXctestDeviceSetRedirect(paths.xctestDeviceSetPath);
172160

173161
assert.equal(fs.existsSync(paths.xctestDeviceSetPath), false);
174162
assert.equal(fs.existsSync(paths.backupPath), false);
163+
assert.deepEqual(phases, []);
175164
});
176165

177-
/** Runs `step` with the other daemon's whole restore landing just before this daemon's `call`. */
166+
/** Runs the restore with the other daemon's whole restore landing just before this one's `call`. */
178167
function withOtherDaemonFinishingBefore(
179-
call: 'readlinkSync' | 'unlinkSync' | 'renameSync',
168+
call: 'unlinkSync' | 'renameSync',
180169
paths: LegacyRedirect,
181-
device: Parameters<typeof restoreLegacyXctestDeviceSetRedirect>[0],
182170
): void {
183171
const original = fs[call] as (...args: unknown[]) => unknown;
184172
vi.spyOn(fs, call).mockImplementationOnce(((...args: unknown[]) => {
185-
restoreLegacyXctestDeviceSetRedirect(device, paths.xctestDeviceSetPath);
173+
restoreLegacyXctestDeviceSetRedirect(paths.xctestDeviceSetPath);
186174
return original.apply(fs, args);
187175
}) as never);
188-
restoreLegacyXctestDeviceSetRedirect(device, paths.xctestDeviceSetPath);
176+
restoreLegacyXctestDeviceSetRedirect(paths.xctestDeviceSetPath);
189177
}
190178

191179
test('a daemon whose unlink or rename the other daemon already made finishes the restore', () => {
@@ -194,7 +182,7 @@ test('a daemon whose unlink or rename the other daemon already made finishes the
194182
fs.mkdirSync(path.join(paths.backupPath, 'HOST-UDID'), { recursive: true });
195183
fs.symlinkSync(paths.scopedSetPath, paths.xctestDeviceSetPath, 'dir');
196184

197-
withOtherDaemonFinishingBefore(call, paths, IOS_SIMULATOR);
185+
withOtherDaemonFinishingBefore(call, paths);
198186

199187
assert.equal(fs.lstatSync(paths.xctestDeviceSetPath).isSymbolicLink(), false, call);
200188
assert.ok(fs.existsSync(path.join(paths.xctestDeviceSetPath, 'HOST-UDID')), call);
@@ -204,17 +192,6 @@ test('a daemon whose unlink or rename the other daemon already made finishes the
204192
}
205193
});
206194

207-
test('a daemon whose link the other daemon removed before it was read leaves the host alone', () => {
208-
const paths = makeLegacyPaths();
209-
const scoped = { ...IOS_SIMULATOR, simulatorSetPath: paths.scopedSetPath };
210-
fs.symlinkSync(paths.scopedSetPath, paths.xctestDeviceSetPath, 'dir');
211-
212-
withOtherDaemonFinishingBefore('readlinkSync', paths, scoped);
213-
214-
assert.equal(fs.lstatSync(paths.xctestDeviceSetPath, { throwIfNoEntry: false }), undefined);
215-
assert.ok(fs.existsSync(path.join(paths.scopedSetPath, 'SCOPED-UDID')));
216-
});
217-
218195
test('an unlink that fails while the link is still there is reported', () => {
219196
const paths = makeLegacyPaths();
220197
fs.mkdirSync(paths.backupPath);
@@ -223,8 +200,11 @@ test('an unlink that fails while the link is still there is reported', () => {
223200
throw Object.assign(new Error('EACCES: permission denied'), { code: 'EACCES' });
224201
});
225202

226-
assert.throws(
227-
() => restoreLegacyXctestDeviceSetRedirect(IOS_SIMULATOR, paths.xctestDeviceSetPath),
228-
/EACCES/,
229-
);
203+
assert.throws(() => restoreLegacyXctestDeviceSetRedirect(paths.xctestDeviceSetPath), /EACCES/);
230204
});
205+
206+
function recordDiagnosticPhases(): string[] {
207+
const phases: string[] = [];
208+
appleRunnerTestHost.update({ emitDiagnostic: (event) => phases.push(event.phase) });
209+
return phases;
210+
}

‎packages/platform-apple/src/runner/__tests__/runner-request-cancellation.test.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { mkdtempForTestSync } from './tmp-dir.ts';
88
import { appleRunnerTestHost } from '../test-host.ts';
99

1010
const {
11-
mockRestoreLegacyXctestDeviceSetRedirect,
1211
mockEnsureXctestrunArtifact,
1312
mockGetFreePort,
1413
mockIsProcessAlive,
@@ -23,7 +22,6 @@ const {
2322
mockSignalProcessGroupBestEffort,
2423
mockWaitForRunner,
2524
} = vi.hoisted(() => ({
26-
mockRestoreLegacyXctestDeviceSetRedirect: vi.fn(),
2725
mockEnsureXctestrunArtifact: vi.fn(),
2826
mockGetFreePort: vi.fn(),
2927
mockIsProcessAlive: vi.fn(),
@@ -63,7 +61,6 @@ vi.mock('../runner-xctestrun.ts', async () => {
6361
await vi.importActual<typeof import('../runner-xctestrun.ts')>('../runner-xctestrun.ts');
6462
return {
6563
...actual,
66-
restoreLegacyXctestDeviceSetRedirect: mockRestoreLegacyXctestDeviceSetRedirect,
6764
ensureXctestrunArtifact: mockEnsureXctestrunArtifact,
6865
prepareXctestrunWithEnv: mockPrepareXctestrunWithEnv,
6966
resolveExpectedRunnerCacheMetadata: mockResolveExpectedRunnerCacheMetadata,

‎packages/platform-apple/src/runner/__tests__/runner-session-close.test.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import { mkdtempForTestSync } from './tmp-dir.ts';
1717
// rest of `runner-session.ts` and is held at the test-file size tripwire.
1818

1919
const {
20-
mockRestoreLegacyXctestDeviceSetRedirect,
2120
mockCleanupTempFile,
2221
mockEnsureXctestrunArtifact,
2322
mockGetFreePort,
@@ -36,7 +35,6 @@ const {
3635
mockSignalProcessGroupBestEffort,
3736
mockWaitForRunner,
3837
} = vi.hoisted(() => ({
39-
mockRestoreLegacyXctestDeviceSetRedirect: vi.fn(),
4038
mockCleanupTempFile: vi.fn(),
4139
mockEnsureXctestrunArtifact: vi.fn(),
4240
mockGetFreePort: vi.fn(),
@@ -91,7 +89,6 @@ vi.mock('../runner-xctestrun.ts', async () => {
9189
await vi.importActual<typeof import('../runner-xctestrun.ts')>('../runner-xctestrun.ts');
9290
return {
9391
...actual,
94-
restoreLegacyXctestDeviceSetRedirect: mockRestoreLegacyXctestDeviceSetRedirect,
9592
ensureXctestrunArtifact: mockEnsureXctestrunArtifact,
9693
prepareXctestrunWithEnv: mockPrepareXctestrunWithEnv,
9794
resolveExpectedRunnerCacheMetadata: mockResolveExpectedRunnerCacheMetadata,

‎packages/platform-apple/src/runner/__tests__/runner-session-lifecycle.test.ts‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import {
1717
import { mkdtempForTestSync } from './tmp-dir.ts';
1818

1919
const {
20-
mockRestoreLegacyXctestDeviceSetRedirect,
2120
mockCleanupTempFile,
2221
mockEnsureXctestrunArtifact,
2322
mockGetFreePort,
@@ -37,7 +36,6 @@ const {
3736
mockWaitForRunner,
3837
runnerStateTransitions,
3938
} = vi.hoisted(() => ({
40-
mockRestoreLegacyXctestDeviceSetRedirect: vi.fn(),
4139
mockCleanupTempFile: vi.fn(),
4240
mockEnsureXctestrunArtifact: vi.fn(),
4341
mockGetFreePort: vi.fn(),
@@ -102,7 +100,6 @@ vi.mock('../runner-xctestrun.ts', async () => {
102100
await vi.importActual<typeof import('../runner-xctestrun.ts')>('../runner-xctestrun.ts');
103101
return {
104102
...actual,
105-
restoreLegacyXctestDeviceSetRedirect: mockRestoreLegacyXctestDeviceSetRedirect,
106103
ensureXctestrunArtifact: mockEnsureXctestrunArtifact,
107104
prepareXctestrunWithEnv: mockPrepareXctestrunWithEnv,
108105
resolveExpectedRunnerCacheMetadata: mockResolveExpectedRunnerCacheMetadata,
@@ -372,27 +369,6 @@ test('a scoped simulator-set session hands off like one in the default set', asy
372369
assert.match(leaseRaw(device.id), /"ownerToken": "detached-owner-/);
373370
});
374371

375-
test('a simulator startup puts back a legacy XCTestDevices redirect before adoption and the build', async () => {
376-
const order: string[] = [];
377-
mockRestoreLegacyXctestDeviceSetRedirect.mockImplementationOnce((device: DeviceInfo) =>
378-
order.push(`restore:${device.id}`),
379-
);
380-
appleRunnerTestHost.update({
381-
emitDiagnostic: (event) => {
382-
if (event.phase === 'ios_runner_lease_adoption_skipped') order.push('adopt');
383-
},
384-
});
385-
const ensure = mockEnsureXctestrunArtifact.getMockImplementation();
386-
mockEnsureXctestrunArtifact.mockImplementationOnce(async (...args: unknown[]) => {
387-
order.push('ensure');
388-
return await ensure?.(...args);
389-
});
390-
391-
await ensureRunnerSession({ ...IOS_SIMULATOR, id: 'runner-lifecycle-legacy-redirect' }, {});
392-
393-
assert.deepEqual(order, ['restore:runner-lifecycle-legacy-redirect', 'adopt', 'ensure']);
394-
});
395-
396372
// #2681: the handoff lanes and every gate that keeps a runner on the kill path.
397373
async function serveOneCommand(device: DeviceInfo, session: RunnerSession): Promise<void> {
398374
mockWaitForRunner.mockResolvedValueOnce(runnerResponse({ nodes: [], truncated: false }));

‎packages/platform-apple/src/runner/__tests__/runner-session-readiness.test.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { createLocalAppleToolProvider, withAppleToolProvider } from '../../core/
1818
import { IOS_DEVICE_DEVELOPER_DISK_IMAGE_HINT } from '../../core/devicectl.ts';
1919

2020
const {
21-
mockRestoreLegacyXctestDeviceSetRedirect,
2221
mockCleanupTempFile,
2322
mockEnsureXctestrunArtifact,
2423
mockGetFreePort,
@@ -37,7 +36,6 @@ const {
3736
mockSignalProcessGroupBestEffort,
3837
mockWaitForRunner,
3938
} = vi.hoisted(() => ({
40-
mockRestoreLegacyXctestDeviceSetRedirect: vi.fn(),
4139
mockCleanupTempFile: vi.fn(),
4240
mockEnsureXctestrunArtifact: vi.fn(),
4341
mockGetFreePort: vi.fn(),
@@ -107,7 +105,6 @@ vi.mock('../runner-xctestrun.ts', async () => {
107105
await vi.importActual<typeof import('../runner-xctestrun.ts')>('../runner-xctestrun.ts');
108106
return {
109107
...actual,
110-
restoreLegacyXctestDeviceSetRedirect: mockRestoreLegacyXctestDeviceSetRedirect,
111108
ensureXctestrunArtifact: mockEnsureXctestrunArtifact,
112109
prepareXctestrunWithEnv: mockPrepareXctestrunWithEnv,
113110
resolveExpectedRunnerCacheMetadata: mockResolveExpectedRunnerCacheMetadata,

‎packages/platform-apple/src/runner/__tests__/runner-session-speculative.test.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
import { mkdtempForTestSync } from './tmp-dir.ts';
1111

1212
const {
13-
mockRestoreLegacyXctestDeviceSetRedirect,
1413
mockCleanupTempFile,
1514
mockEnsureXctestrunArtifact,
1615
mockGetFreePort,
@@ -29,7 +28,6 @@ const {
2928
mockSignalProcessGroupBestEffort,
3029
mockWaitForRunner,
3130
} = vi.hoisted(() => ({
32-
mockRestoreLegacyXctestDeviceSetRedirect: vi.fn(),
3331
mockCleanupTempFile: vi.fn(),
3432
mockEnsureXctestrunArtifact: vi.fn(),
3533
mockGetFreePort: vi.fn(),
@@ -69,7 +67,6 @@ vi.mock('../runner-xctestrun.ts', async () => {
6967
await vi.importActual<typeof import('../runner-xctestrun.ts')>('../runner-xctestrun.ts');
7068
return {
7169
...actual,
72-
restoreLegacyXctestDeviceSetRedirect: mockRestoreLegacyXctestDeviceSetRedirect,
7370
ensureXctestrunArtifact: mockEnsureXctestrunArtifact,
7471
prepareXctestrunWithEnv: mockPrepareXctestrunWithEnv,
7572
resolveExpectedRunnerCacheMetadata: mockResolveExpectedRunnerCacheMetadata,

‎packages/platform-apple/src/runner/__tests__/runner-session-stale-bundles.test.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
import { mkdtempForTestSync } from './tmp-dir.ts';
1111

1212
const {
13-
mockRestoreLegacyXctestDeviceSetRedirect,
1413
mockCleanupTempFile,
1514
mockEnsureXctestrunArtifact,
1615
mockGetFreePort,
@@ -29,7 +28,6 @@ const {
2928
mockSignalProcessGroupBestEffort,
3029
mockWaitForRunner,
3130
} = vi.hoisted(() => ({
32-
mockRestoreLegacyXctestDeviceSetRedirect: vi.fn(),
3331
mockCleanupTempFile: vi.fn(),
3432
mockEnsureXctestrunArtifact: vi.fn(),
3533
mockGetFreePort: vi.fn(),
@@ -80,7 +78,6 @@ vi.mock('../runner-xctestrun.ts', async () => {
8078
await vi.importActual<typeof import('../runner-xctestrun.ts')>('../runner-xctestrun.ts');
8179
return {
8280
...actual,
83-
restoreLegacyXctestDeviceSetRedirect: mockRestoreLegacyXctestDeviceSetRedirect,
8481
ensureXctestrunArtifact: mockEnsureXctestrunArtifact,
8582
prepareXctestrunWithEnv: mockPrepareXctestrunWithEnv,
8683
resolveExpectedRunnerCacheMetadata: mockResolveExpectedRunnerCacheMetadata,

‎packages/platform-apple/src/runner/__tests__/runner-session.test.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import {
1919
import { mkdtempForTestSync } from './tmp-dir.ts';
2020

2121
const {
22-
mockRestoreLegacyXctestDeviceSetRedirect,
2322
mockCleanupTempFile,
2423
mockEnsureXctestrunArtifact,
2524
mockGetFreePort,
@@ -38,7 +37,6 @@ const {
3837
mockSignalProcessGroupBestEffort,
3938
mockWaitForRunner,
4039
} = vi.hoisted(() => ({
41-
mockRestoreLegacyXctestDeviceSetRedirect: vi.fn(),
4240
mockCleanupTempFile: vi.fn(),
4341
mockEnsureXctestrunArtifact: vi.fn(),
4442
mockGetFreePort: vi.fn(),
@@ -108,7 +106,6 @@ vi.mock('../runner-xctestrun.ts', async () => {
108106
await vi.importActual<typeof import('../runner-xctestrun.ts')>('../runner-xctestrun.ts');
109107
return {
110108
...actual,
111-
restoreLegacyXctestDeviceSetRedirect: mockRestoreLegacyXctestDeviceSetRedirect,
112109
ensureXctestrunArtifact: mockEnsureXctestrunArtifact,
113110
prepareXctestrunWithEnv: mockPrepareXctestrunWithEnv,
114111
resolveExpectedRunnerCacheMetadata: mockResolveExpectedRunnerCacheMetadata,

0 commit comments

Comments
 (0)