github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-09 18:54:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(test): centralize temp workspace env handling for skill install tests

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-21 18:52:38 +00:00
parent 61817c90e7
commit 603e28648b
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/agents/skills-install.download-test-utils.ts
View File

@@ -1,6 +1,7 @@
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import os from "node:os"; import os from "node:os";
import path from "node:path"; import path from "node:path";
import { captureEnv } from "../test-utils/env.js";
export function setTempStateDir(workspaceDir: string): string { export function setTempStateDir(workspaceDir: string): string {
const stateDir = path.join(workspaceDir, "state"); const stateDir = path.join(workspaceDir, "state");
@@ -11,11 +12,13 @@ export function setTempStateDir(workspaceDir: string): string {
export async function withTempWorkspace( export async function withTempWorkspace(
run: (params: { workspaceDir: string; stateDir: string }) => Promise<void>, run: (params: { workspaceDir: string; stateDir: string }) => Promise<void>,
) { ) {
const envSnapshot = captureEnv(["OPENCLAW_STATE_DIR"]);
const workspaceDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-skills-install-")); const workspaceDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-skills-install-"));
try { try {
const stateDir = setTempStateDir(workspaceDir); const stateDir = setTempStateDir(workspaceDir);
await run({ workspaceDir, stateDir }); await run({ workspaceDir, stateDir });
} finally { } finally {
envSnapshot.restore();
await fs.rm(workspaceDir, { recursive: true, force: true }).catch(() => undefined); await fs.rm(workspaceDir, { recursive: true, force: true }).catch(() => undefined);
} }
} }

16
src/agents/skills-install.e2e.test.ts
View File

@@ -1,7 +1,7 @@
import fs from "node:fs/promises"; import fs from "node:fs/promises";
import os from "node:os";
import path from "node:path"; import path from "node:path";
import { beforeEach, describe, expect, it, vi } from "vitest"; import { beforeEach, describe, expect, it, vi } from "vitest";
import { withTempWorkspace } from "./skills-install.download-test-utils.js";
import { installSkill } from "./skills-install.js"; import { installSkill } from "./skills-install.js";
const runCommandWithTimeoutMock = vi.fn(); const runCommandWithTimeoutMock = vi.fn();
@@ -52,8 +52,7 @@ describe("installSkill code safety scanning", () => {
}); });
it("adds detailed warnings for critical findings and continues install", async () => { it("adds detailed warnings for critical findings and continues install", async () => {
const workspaceDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-skills-install-")); await withTempWorkspace(async ({ workspaceDir }) => {
try {
const skillDir = await writeInstallableSkill(workspaceDir, "danger-skill"); const skillDir = await writeInstallableSkill(workspaceDir, "danger-skill");
scanDirectoryWithSummaryMock.mockResolvedValue({ scanDirectoryWithSummaryMock.mockResolvedValue({
scannedFiles: 1, scannedFiles: 1,
@@ -83,14 +82,11 @@ describe("installSkill code safety scanning", () => {
true, true,
); );
expect(result.warnings?.some((warning) => warning.includes("runner.js:1"))).toBe(true); expect(result.warnings?.some((warning) => warning.includes("runner.js:1"))).toBe(true);
} finally { });
await fs.rm(workspaceDir, { recursive: true, force: true }).catch(() => undefined);
}
}); });
it("warns and continues when skill scan fails", async () => { it("warns and continues when skill scan fails", async () => {
const workspaceDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-skills-install-")); await withTempWorkspace(async ({ workspaceDir }) => {
try {
await writeInstallableSkill(workspaceDir, "scanfail-skill"); await writeInstallableSkill(workspaceDir, "scanfail-skill");
scanDirectoryWithSummaryMock.mockRejectedValue(new Error("scanner exploded")); scanDirectoryWithSummaryMock.mockRejectedValue(new Error("scanner exploded"));
@@ -107,8 +103,6 @@ describe("installSkill code safety scanning", () => {
expect(result.warnings?.some((warning) => warning.includes("Installation continues"))).toBe( expect(result.warnings?.some((warning) => warning.includes("Installation continues"))).toBe(
true, true,
); );
} finally { });
await fs.rm(workspaceDir, { recursive: true, force: true }).catch(() => undefined);
}
}); });
}); });