Chrome DevTools for coding agents
test: remove redundant CLI calls from e2e setup and cleanup (#3164)
Alex Rudenkod777154c8ec6
diff --git a/tests/e2e/chrome-devtools-commands.test.ts b/tests/e2e/chrome-devtools-commands.test.tsindex 397e9777..d4698a4c 100644--- a/tests/e2e/chrome-devtools-commands.test.ts+++ b/tests/e2e/chrome-devtools-commands.test.ts@@ -12,29 +12,24 @@ import {describe, it, afterEach, beforeEach} from 'node:test';import {pathToFileURL} from 'node:url';import {- assertDaemonIsNotRunning,assertDaemonIsRunning,createTempDir,runCli,+ stopDaemonForCleanup,} from '../utils.js';describe('chrome-devtools', () => {let sessionId: string;- beforeEach(async () => {+ beforeEach(() => {sessionId = crypto.randomUUID();- await runCli(['stop'], sessionId);- await assertDaemonIsNotRunning(sessionId);});afterEach(async () => {- await runCli(['stop'], sessionId);- await assertDaemonIsNotRunning(sessionId);+ await stopDaemonForCleanup(sessionId);});it('can invoke list_pages', async () => {- await assertDaemonIsNotRunning(sessionId);-const startResult = await runCli(['start'], sessionId);assert.strictEqual(startResult.status,diff --git a/tests/e2e/chrome-devtools-disabled-tools.test.ts b/tests/e2e/chrome-devtools-disabled-tools.test.tsindex b829fc41..0f47d264 100644--- a/tests/e2e/chrome-devtools-disabled-tools.test.ts+++ b/tests/e2e/chrome-devtools-disabled-tools.test.ts@@ -8,20 +8,17 @@ import assert from 'node:assert';import crypto from 'node:crypto';import {describe, it, afterEach, beforeEach} from 'node:test';-import {assertDaemonIsNotRunning, runCli} from '../utils.js';+import {runCli, stopDaemonForCleanup} from '../utils.js';describe('chrome-devtools', () => {let sessionId: string;- beforeEach(async () => {+ beforeEach(() => {sessionId = crypto.randomUUID();- await runCli(['stop'], sessionId);- await assertDaemonIsNotRunning(sessionId);});afterEach(async () => {- await runCli(['stop'], sessionId);- await assertDaemonIsNotRunning(sessionId);+ await stopDaemonForCleanup(sessionId);});it('fails to invoke list_network_requests when categoryNetwork is disabled', async () => {diff --git a/tests/e2e/chrome-devtools-disclaimers.test.ts b/tests/e2e/chrome-devtools-disclaimers.test.tsindex 7810b4f8..0b8f4c97 100644--- a/tests/e2e/chrome-devtools-disclaimers.test.ts+++ b/tests/e2e/chrome-devtools-disclaimers.test.ts@@ -8,20 +8,17 @@ import assert from 'node:assert';import crypto from 'node:crypto';import {describe, it, afterEach, beforeEach} from 'node:test';-import {assertDaemonIsNotRunning, runCli} from '../utils.js';+import {runCli, stopDaemonForCleanup} from '../utils.js';describe('chrome-devtools', () => {let sessionId: string;- beforeEach(async () => {+ beforeEach(() => {sessionId = crypto.randomUUID();- await runCli(['stop'], sessionId);- await assertDaemonIsNotRunning(sessionId);});afterEach(async () => {- await runCli(['stop'], sessionId);- await assertDaemonIsNotRunning(sessionId);+ await stopDaemonForCleanup(sessionId);});it('forwards disclaimers to stderr on start', async () => {diff --git a/tests/e2e/chrome-devtools-performance.test.ts b/tests/e2e/chrome-devtools-performance.test.tsindex 5c3e889b..a239b1bd 100644--- a/tests/e2e/chrome-devtools-performance.test.ts+++ b/tests/e2e/chrome-devtools-performance.test.ts@@ -8,20 +8,17 @@ import assert from 'node:assert';import crypto from 'node:crypto';import {describe, it, afterEach, beforeEach} from 'node:test';-import {assertDaemonIsNotRunning, runCli} from '../utils.js';+import {runCli, stopDaemonForCleanup} from '../utils.js';describe('chrome-devtools', () => {let sessionId: string;- beforeEach(async () => {+ beforeEach(() => {sessionId = crypto.randomUUID();- await runCli(['stop'], sessionId);- await assertDaemonIsNotRunning(sessionId);});afterEach(async () => {- await runCli(['stop'], sessionId);- await assertDaemonIsNotRunning(sessionId);+ await stopDaemonForCleanup(sessionId);});it('can record a performance trace', async () => {diff --git a/tests/e2e/chrome-devtools-start-stop.test.ts b/tests/e2e/chrome-devtools-start-stop.test.tsindex 2d4c1cb0..100118f8 100644--- a/tests/e2e/chrome-devtools-start-stop.test.ts+++ b/tests/e2e/chrome-devtools-start-stop.test.ts@@ -15,20 +15,18 @@ import {createTempDir,createTempFile,runCli,+ stopDaemonForCleanup,} from '../utils.js';describe('chrome-devtools', () => {let sessionId: string;- beforeEach(async () => {+ beforeEach(() => {sessionId = crypto.randomUUID();- await runCli(['stop'], sessionId);- await assertDaemonIsNotRunning(sessionId);});afterEach(async () => {- await runCli(['stop'], sessionId);- await assertDaemonIsNotRunning(sessionId);+ await stopDaemonForCleanup(sessionId);});it('can start and stop the daemon', async () => {diff --git a/tests/e2e/chrome-devtools-status.test.ts b/tests/e2e/chrome-devtools-status.test.tsindex 13d12957..6dc5d3b8 100644--- a/tests/e2e/chrome-devtools-status.test.ts+++ b/tests/e2e/chrome-devtools-status.test.ts@@ -12,20 +12,18 @@ import {assertDaemonIsNotRunning,assertDaemonIsRunning,runCli,+ stopDaemonForCleanup,} from '../utils.js';describe('chrome-devtools', () => {let sessionId: string;- beforeEach(async () => {+ beforeEach(() => {sessionId = crypto.randomUUID();- await runCli(['stop'], sessionId);- await assertDaemonIsNotRunning(sessionId);});afterEach(async () => {- await runCli(['stop'], sessionId);- await assertDaemonIsNotRunning(sessionId);+ await stopDaemonForCleanup(sessionId);});it('reports daemon status correctly', async () => {diff --git a/tests/utils.ts b/tests/utils.tsindex 614ddc56..47a4f591 100644--- a/tests/utils.ts+++ b/tests/utils.ts@@ -25,6 +25,8 @@ import type {import sinon from 'sinon';import type {ParsedArguments} from '../src/config/ConfigParser.js';+import {stopDaemon} from '../src/daemon/client.js';+import {isDaemonRunning} from '../src/daemon/utils.js';import {McpContext} from '../src/McpContext.js';import {McpResponse} from '../src/McpResponse.js';import {HeapSnapshotManager} from '../src/processors/HeapSnapshotManager.js';@@ -472,6 +474,15 @@ export async function assertDaemonIsNotRunning(sessionId?: string) {);}+/**+ * Stops the daemon in-process. Use it for test cleanup: it does not spawn+ * a CLI process, which takes about a second per call.+ */+export async function stopDaemonForCleanup(sessionId: string) {+ await stopDaemon(sessionId);+ assert.ok(!isDaemonRunning(sessionId), 'daemon is still running');+}+export async function assertDaemonIsRunning(sessionId?: string) {const result = await runCli(['status'], sessionId);assert.ok(