Skip to content

Commit 480fcc0

Browse files
committed
test: make idle reap tests deterministic
1 parent ee83c0a commit 480fcc0

2 files changed

Lines changed: 34 additions & 18 deletions

File tree

‎src/daemon/server/daemon-idle-reap.test.ts‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import assert from 'node:assert/strict';
22
import fs from 'node:fs';
33
import os from 'node:os';
44
import path from 'node:path';
5-
import { afterEach, beforeEach, test } from 'vitest';
5+
import { afterEach, beforeEach, test, vi } from 'vitest';
66
import { IOS_SIMULATOR } from '../../__tests__/test-utils/index.ts';
77
import { SessionStore } from '../session-store.ts';
88
import type { SessionState } from '../types.ts';
@@ -24,6 +24,7 @@ beforeEach(() => {
2424

2525
afterEach(() => {
2626
fs.rmSync(stateDir, { recursive: true, force: true });
27+
vi.useRealTimers();
2728
});
2829

2930
function makeSession(overrides: Partial<SessionState> = {}): SessionState {
@@ -92,6 +93,7 @@ test('isDaemonIdle requires no in-flight requests, no sessions, and no recording
9293
});
9394

9495
test('idle reap fires after the idle window when nothing is using the daemon', async () => {
96+
vi.useFakeTimers();
9597
let reaped = 0;
9698
const idleReap = createDaemonIdleReap({
9799
sessionStore,
@@ -103,12 +105,15 @@ test('idle reap fires after the idle window when nothing is using the daemon', a
103105
});
104106

105107
idleReap.noteActivity();
106-
await new Promise((resolve) => setTimeout(resolve, 150));
108+
await vi.advanceTimersByTimeAsync(39);
109+
assert.equal(reaped, 0);
110+
await vi.advanceTimersByTimeAsync(1);
107111

108112
assert.equal(reaped, 1);
109113
});
110114

111115
test('idle reap does not fire while a session is open', async () => {
116+
vi.useFakeTimers();
112117
let reaped = 0;
113118
sessionStore.set('default', makeSession());
114119
const idleReap = createDaemonIdleReap({
@@ -123,12 +128,13 @@ test('idle reap does not fire while a session is open', async () => {
123128
// Simulates a quiet mid-session pause: activity settles, but the session
124129
// itself stays open the whole time.
125130
idleReap.noteActivity();
126-
await new Promise((resolve) => setTimeout(resolve, 150));
131+
await vi.advanceTimersByTimeAsync(150);
127132

128133
assert.equal(reaped, 0);
129134
});
130135

131136
test('idle reap does not fire while a recording is active', async () => {
137+
vi.useFakeTimers();
132138
let reaped = 0;
133139
sessionStore.set(
134140
'default',
@@ -154,12 +160,13 @@ test('idle reap does not fire while a recording is active', async () => {
154160
});
155161

156162
idleReap.noteActivity();
157-
await new Promise((resolve) => setTimeout(resolve, 150));
163+
await vi.advanceTimersByTimeAsync(150);
158164

159165
assert.equal(reaped, 0);
160166
});
161167

162168
test('idle reap does not fire while a request is in flight', async () => {
169+
vi.useFakeTimers();
163170
let reaped = 0;
164171
let inFlightRequestCount = 1;
165172
const idleReap = createDaemonIdleReap({
@@ -172,16 +179,17 @@ test('idle reap does not fire while a request is in flight', async () => {
172179
});
173180

174181
idleReap.noteActivity();
175-
await new Promise((resolve) => setTimeout(resolve, 150));
182+
await vi.advanceTimersByTimeAsync(150);
176183
assert.equal(reaped, 0);
177184

178185
inFlightRequestCount = 0;
179186
idleReap.noteActivity();
180-
await new Promise((resolve) => setTimeout(resolve, 150));
187+
await vi.advanceTimersByTimeAsync(40);
181188
assert.equal(reaped, 1);
182189
});
183190

184191
test('idle reap is disabled when the window is zero', async () => {
192+
vi.useFakeTimers();
185193
let reaped = 0;
186194
const idleReap = createDaemonIdleReap({
187195
sessionStore,
@@ -193,12 +201,13 @@ test('idle reap is disabled when the window is zero', async () => {
193201
});
194202

195203
idleReap.noteActivity();
196-
await new Promise((resolve) => setTimeout(resolve, 100));
204+
await vi.advanceTimersByTimeAsync(100);
197205

198206
assert.equal(reaped, 0);
199207
});
200208

201209
test('cancel prevents a scheduled reap from firing', async () => {
210+
vi.useFakeTimers();
202211
let reaped = 0;
203212
const idleReap = createDaemonIdleReap({
204213
sessionStore,
@@ -211,7 +220,7 @@ test('cancel prevents a scheduled reap from firing', async () => {
211220

212221
idleReap.noteActivity();
213222
idleReap.cancel();
214-
await new Promise((resolve) => setTimeout(resolve, 150));
223+
await vi.advanceTimersByTimeAsync(150);
215224

216225
assert.equal(reaped, 0);
217226
});

‎src/daemon/server/daemon-runtime-idle-reap.test.ts‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@ import assert from 'node:assert/strict';
22
import fs from 'node:fs';
33
import os from 'node:os';
44
import path from 'node:path';
5-
import { test } from 'vitest';
5+
import { afterEach, test, vi } from 'vitest';
66
import { resolveDaemonPaths } from '../config.ts';
77
import { startDaemonRuntime } from './daemon-runtime.ts';
88

9+
afterEach(() => {
10+
vi.useRealTimers();
11+
});
12+
913
test('daemon runtime self-reaps after the idle window when nothing ever uses it', async () => {
14+
vi.useFakeTimers();
1015
const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-daemon-idle-reap-rt-'));
1116
const paths = resolveDaemonPaths(stateDir);
1217
let exitCode: number | undefined;
@@ -33,13 +38,13 @@ test('daemon runtime self-reaps after the idle window when nothing ever uses it'
3338
});
3439
assert.notEqual(runtime, null);
3540
assert.ok(fs.existsSync(paths.lockPath), 'daemon lock should be held right after startup');
41+
assert.equal(exitCode, undefined);
3642

37-
await Promise.race([
38-
exited,
39-
new Promise((_, reject) =>
40-
setTimeout(() => reject(new Error('idle reap did not fire in time')), 2_000),
41-
),
42-
]);
43+
await vi.advanceTimersByTimeAsync(79);
44+
assert.equal(exitCode, undefined);
45+
await vi.advanceTimersByTimeAsync(1);
46+
await vi.runOnlyPendingTimersAsync();
47+
await exited;
4348

4449
assert.equal(exitCode, 0);
4550
assert.equal(fs.existsSync(paths.infoPath), false);
@@ -50,6 +55,7 @@ test('daemon runtime self-reaps after the idle window when nothing ever uses it'
5055
});
5156

5257
test('daemon runtime never self-reaps when AGENT_DEVICE_DAEMON_IDLE_TIMEOUT_MS is 0', async () => {
58+
vi.useFakeTimers();
5359
const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-daemon-idle-reap-off-'));
5460
let exitCode: number | undefined;
5561

@@ -70,10 +76,11 @@ test('daemon runtime never self-reaps when AGENT_DEVICE_DAEMON_IDLE_TIMEOUT_MS i
7076
});
7177
assert.notEqual(runtime, null);
7278

73-
await new Promise((resolve) => setTimeout(resolve, 200));
74-
79+
await vi.advanceTimersByTimeAsync(200);
7580
assert.equal(exitCode, undefined);
76-
await runtime?.shutdown();
81+
const shutdownPromise = runtime?.shutdown();
82+
await vi.runOnlyPendingTimersAsync();
83+
await shutdownPromise;
7784
assert.equal(exitCode, 0);
7885
} finally {
7986
fs.rmSync(stateDir, { recursive: true, force: true });

0 commit comments

Comments
 (0)