From 6a465611d8e9fed72eebe497630646bebc02e57c Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Fri, 3 Apr 2026 20:14:16 +0100 Subject: [PATCH] test: trim openclaw tools partial mocks --- src/agents/openclaw-tools.agents.test.ts | 4 ++-- src/agents/openclaw-tools.sessions-visibility.test.ts | 9 +++++---- src/agents/openclaw-tools.sessions.test.ts | 4 ++-- ...w-tools.subagents.sessions-spawn-depth-limits.test.ts | 9 +++++---- ...claw-tools.subagents.sessions-spawn.lifecycle.test.ts | 4 ++-- ...enclaw-tools.subagents.sessions-spawn.test-harness.ts | 8 ++++---- src/agents/openclaw-tools.subagents.test-harness.ts | 4 ++-- 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/agents/openclaw-tools.agents.test.ts b/src/agents/openclaw-tools.agents.test.ts index 5d2b441baad..4a26b62ec97 100644 --- a/src/agents/openclaw-tools.agents.test.ts +++ b/src/agents/openclaw-tools.agents.test.ts @@ -5,8 +5,8 @@ let configOverride: ReturnType<(typeof import("../config/config.js"))["loadConfi session: createPerSenderSessionConfig(), }; -vi.mock("../config/config.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("../config/config.js", async () => { + const actual = await vi.importActual("../config/config.js"); return { ...actual, loadConfig: () => configOverride, diff --git a/src/agents/openclaw-tools.sessions-visibility.test.ts b/src/agents/openclaw-tools.sessions-visibility.test.ts index fbac0eb52fd..42465ced5c0 100644 --- a/src/agents/openclaw-tools.sessions-visibility.test.ts +++ b/src/agents/openclaw-tools.sessions-visibility.test.ts @@ -8,8 +8,8 @@ vi.mock("../gateway/call.js", () => ({ let mockConfig: Record = { session: { mainKey: "main", scope: "per-sender" }, }; -vi.mock("../config/config.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("../config/config.js", async () => { + const actual = await vi.importActual("../config/config.js"); return { ...actual, loadConfig: () => mockConfig, @@ -26,8 +26,9 @@ async function loadFreshOpenClawToolsModuleForTest() { vi.doMock("../gateway/call.js", () => ({ callGateway: (opts: unknown) => callGatewayMock(opts), })); - vi.doMock("../config/config.js", async (importOriginal) => { - const actual = await importOriginal(); + vi.doMock("../config/config.js", async () => { + const actual = + await vi.importActual("../config/config.js"); return { ...actual, loadConfig: () => mockConfig, diff --git a/src/agents/openclaw-tools.sessions.test.ts b/src/agents/openclaw-tools.sessions.test.ts index 6ec2c58e530..64014c2f143 100644 --- a/src/agents/openclaw-tools.sessions.test.ts +++ b/src/agents/openclaw-tools.sessions.test.ts @@ -12,8 +12,8 @@ vi.mock("../gateway/call.js", () => ({ callGateway: (opts: unknown) => callGatewayMock(opts), })); -vi.mock("../config/config.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("../config/config.js", async () => { + const actual = await vi.importActual("../config/config.js"); return { ...actual, loadConfig: () => ({ diff --git a/src/agents/openclaw-tools.subagents.sessions-spawn-depth-limits.test.ts b/src/agents/openclaw-tools.subagents.sessions-spawn-depth-limits.test.ts index bdcfbbd2fc0..957a8c6d7d1 100644 --- a/src/agents/openclaw-tools.subagents.sessions-spawn-depth-limits.test.ts +++ b/src/agents/openclaw-tools.subagents.sessions-spawn-depth-limits.test.ts @@ -18,8 +18,8 @@ let addSubagentRunForTests: typeof import("./subagent-registry.js").addSubagentR let resetSubagentRegistryForTests: typeof import("./subagent-registry.js").resetSubagentRegistryForTests; let createSessionsSpawnTool: typeof import("./tools/sessions-spawn-tool.js").createSessionsSpawnTool; -vi.mock("../config/config.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("../config/config.js", async () => { + const actual = await vi.importActual("../config/config.js"); return { ...actual, loadConfig: () => configOverride, @@ -66,8 +66,9 @@ async function loadFreshSessionsSpawnModulesForTest() { vi.doMock("../gateway/call.js", () => ({ callGateway: (opts: unknown) => callGatewayMock(opts), })); - vi.doMock("../config/config.js", async (importOriginal) => { - const actual = await importOriginal(); + vi.doMock("../config/config.js", async () => { + const actual = + await vi.importActual("../config/config.js"); return { ...actual, loadConfig: () => configOverride, diff --git a/src/agents/openclaw-tools.subagents.sessions-spawn.lifecycle.test.ts b/src/agents/openclaw-tools.subagents.sessions-spawn.lifecycle.test.ts index 9d0ea0dc991..82347761792 100644 --- a/src/agents/openclaw-tools.subagents.sessions-spawn.lifecycle.test.ts +++ b/src/agents/openclaw-tools.subagents.sessions-spawn.lifecycle.test.ts @@ -39,8 +39,8 @@ const hookRunnerMocks = vi.hoisted(() => ({ runSubagentEnded: vi.fn(async () => {}), })); -vi.mock("./pi-embedded.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("./pi-embedded.js", async () => { + const actual = await vi.importActual("./pi-embedded.js"); return { ...actual, isEmbeddedPiRunActive: () => false, diff --git a/src/agents/openclaw-tools.subagents.sessions-spawn.test-harness.ts b/src/agents/openclaw-tools.subagents.sessions-spawn.test-harness.ts index eff8b69d71a..4f79194b363 100644 --- a/src/agents/openclaw-tools.subagents.sessions-spawn.test-harness.ts +++ b/src/agents/openclaw-tools.subagents.sessions-spawn.test-harness.ts @@ -259,8 +259,8 @@ vi.mock("../../gateway/call.js", () => ({ callGateway: (opts: unknown) => hoisted.callGatewayMock(opts), })); -vi.mock("../config/config.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("../config/config.js", async () => { + const actual = await vi.importActual("../config/config.js"); return { ...actual, loadConfig: () => hoisted.state.configOverride, @@ -269,8 +269,8 @@ vi.mock("../config/config.js", async (importOriginal) => { }); // Same module, different specifier (used by tools under src/agents/tools/*). -vi.mock("../../config/config.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("../../config/config.js", async () => { + const actual = await vi.importActual("../config/config.js"); return { ...actual, loadConfig: () => hoisted.state.configOverride, diff --git a/src/agents/openclaw-tools.subagents.test-harness.ts b/src/agents/openclaw-tools.subagents.test-harness.ts index 4a832738ab6..465305ea9a1 100644 --- a/src/agents/openclaw-tools.subagents.test-harness.ts +++ b/src/agents/openclaw-tools.subagents.test-harness.ts @@ -44,8 +44,8 @@ vi.mock("../gateway/call.js", () => ({ callGateway: (opts: unknown) => callGatewayMock(opts), })); -vi.mock("../config/config.js", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("../config/config.js", async () => { + const actual = await vi.importActual("../config/config.js"); return { ...actual, loadConfig: () => configOverride,