Skip to content

Commit fb61e68

Browse files
thymikeeclaude
thymikee
and
claude
authored
refactor(daemon): move the daemon-only transport tests into the package (#3638)
* refactor(daemon): move the daemon-only transport tests into the package Co-Authored-By: Claude Opus 5.5 <[email protected]> * chore(daemon): declare the proxy dependency the moved test needs Co-Authored-By: Claude Opus 5.5 <[email protected]> * refactor(daemon): name each moved transport test for the module it sits beside Co-Authored-By: Claude Opus 5.5 <[email protected]> --------- Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent f9aef84 commit fb61e68

12 files changed

Lines changed: 21 additions & 22 deletions

‎packages/daemon/package.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"@agent-device/platform-android": "workspace:*",
1919
"@agent-device/platform-apple": "workspace:*",
2020
"@agent-device/platform-web": "workspace:*",
21+
"@agent-device/proxy": "workspace:*",
2122
"@agent-device/replay-port": "workspace:*",
2223
"@agent-device/replay-test": "workspace:*",
2324
"@agent-device/selectors": "workspace:*",
@@ -351,10 +352,6 @@
351352
"types": "./src/server/http/http-server.ts",
352353
"default": "./src/server/http/http-server.ts"
353354
},
354-
"./testing/server/server-lifecycle": {
355-
"types": "./src/server/http/server-lifecycle.ts",
356-
"default": "./src/server/http/server-lifecycle.ts"
357-
},
358355
"./testing/server/server-shutdown": {
359356
"types": "./src/server/http/server-shutdown.ts",
360357
"default": "./src/server/http/server-shutdown.ts"

‎packages/daemon/src/server/__tests__/http-server-rpc-lifetime.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const TOKEN = 'lifetime-token';
1212
// the rerun below would be refused as `duplicate_request_id`. The token gate refuses a call that
1313
// already registered — admission order is pinned in `http-server-rpc-admission.test.ts` — so
1414
// this is where that release is pinned. Disconnect and streaming releases live in
15-
// `daemon-http-server.test.ts` and `daemon-http-boundary-cancellation.test.ts`.
15+
// `daemon-http-server.test.ts` and `http-server-boundary-cancellation.test.ts`.
1616
test('an rpc request registers its tracking id while in flight and releases it once answered', async (t) => {
1717
if (await skipWhenLoopbackUnavailable(t)) return;
1818
const { port, server } = await startRpcServer(TOKEN, async (request) => {

test/integration/provider-scenarios/daemon-http-boundary-cancellation.test.ts renamed to packages/daemon/src/server/http/http-server-boundary-cancellation.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import assert from 'node:assert/strict';
44
import http from 'node:http';
55
import { test } from 'vitest';
66
import { getRequestSignal } from '@agent-device/host-kit/request';
7-
import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
7+
import { createDaemonHttpServer } from './http-server.ts';
88
import {
99
closeLoopbackServer,
1010
listenOnLoopback,

test/integration/provider-scenarios/daemon-http-disconnect.test.ts renamed to packages/daemon/src/server/http/http-server-disconnect.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import assert from 'node:assert/strict';
44
import http from 'node:http';
55
import { test } from 'vitest';
66
import { getRequestSignal } from '@agent-device/host-kit/request';
7-
import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
7+
import { createDaemonHttpServer } from './http-server.ts';
88
import {
99
closeLoopbackServer,
1010
listenOnLoopback,

test/integration/provider-scenarios/daemon-http-lease-allocate.test.ts renamed to packages/daemon/src/server/http/http-server-lease-allocate.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { DaemonWireRequest } from '@agent-device/contracts/command';
22
import type { DaemonResponse } from '@agent-device/kernel/contracts';
33
import assert from 'node:assert/strict';
44
import { test } from 'vitest';
5-
import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
5+
import { createDaemonHttpServer } from './http-server.ts';
66
import {
77
closeLoopbackServer,
88
listenOnLoopback,

src/__tests__/daemon-proxy.test.ts renamed to packages/daemon/src/server/http/http-server-proxy.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import assert from 'node:assert/strict';
33
import crypto from 'node:crypto';
44
import http from 'node:http';
55
import { createDaemonProxyServer } from '@agent-device/proxy';
6-
import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
6+
import { createDaemonHttpServer } from './http-server.ts';
77
import { getRequestSignal } from '@agent-device/host-kit/request';
88
import { readHostCpuArch } from '@agent-device/host-kit/process';
99
import { executeRunScriptHttpRequest } from '@agent-device/maestro/run-script-http';

test/integration/provider-scenarios/daemon-http-resumable-upload.test.ts renamed to packages/daemon/src/server/http/http-server-resumable-upload.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import { test } from 'vitest';
77
import {
88
cleanupUploadedArtifact,
99
prepareUploadedArtifact,
10-
} from '@agent-device/daemon/testing/artifact-tracking';
11-
import { createDaemonHttpServer } from '@agent-device/daemon/testing/server/http-server';
10+
} from '../../resources/artifact-tracking.ts';
11+
import { createDaemonHttpServer } from './http-server.ts';
1212
import {
1313
closeLoopbackServer,
1414
listenOnLoopback,

test/integration/provider-scenarios/daemon-lifecycle.test.ts renamed to packages/daemon/src/server/http/server-lifecycle.test.ts

Lines changed: 1 addition & 1 deletion
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 path from 'node:path';
44
import { test } from 'vitest';
5-
import { parseIntegerEnv } from '@agent-device/daemon/testing/server/server-lifecycle';
5+
import { parseIntegerEnv } from './server-lifecycle.ts';
66
import { tryAcquireDaemonRegistration } from '@agent-device/daemon-contracts/daemon-registration-owner';
77
import { resolveDaemonPaths } from '@agent-device/daemon-contracts/daemon-resolution';
88
import { mkdtempForTestSync } from '@agent-device/test-kit/tmp-dir';

test/integration/provider-scenarios/daemon-transport.test.ts renamed to packages/daemon/src/server/http/transport.test.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
import type { DaemonRequest } from '@agent-device/daemon';
1+
import type { DaemonRequest } from '../../core/daemon-request.ts';
22
import type { DaemonResponse } from '@agent-device/kernel/contracts';
33
import assert from 'node:assert/strict';
44
import http from 'node:http';
55
import net from 'node:net';
66
import { test } from 'vitest';
7-
import {
8-
createSocketServer,
9-
listenHttpServer,
10-
listenNetServer,
11-
} from '@agent-device/daemon/testing/server/transport';
7+
import { createSocketServer, listenHttpServer, listenNetServer } from './transport.ts';
128
import { getRequestSignal } from '@agent-device/host-kit/request';
139
import { closeLoopbackServer, skipWhenLoopbackUnavailable } from '@agent-device/test-kit/loopback';
1410

‎packages/daemon/tsconfig.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@
5050
{
5151
"path": "../platform-web"
5252
},
53+
{
54+
"path": "../proxy"
55+
},
5356
{
5457
"path": "../replay-port"
5558
},

0 commit comments

Comments
 (0)