test: speed up heavy suites with shared fixtures

This commit is contained in:
Peter Steinberger
2026-03-02 21:58:19 +00:00
parent 6358aae024
commit 3beb1b9da9
12 changed files with 227 additions and 151 deletions

View File

@@ -1,7 +1,9 @@
import fs from "node:fs/promises";
import path from "node:path";
import { beforeEach, describe, expect, it, vi } from "vitest";
import { withTempWorkspace } from "./skills-install.download-test-utils.js";
import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import { createFixtureSuite } from "../test-utils/fixture-suite.js";
import { createTempHomeEnv, type TempHomeEnv } from "../test-utils/temp-home.js";
import { setTempStateDir } from "./skills-install.download-test-utils.js";
import { installSkill } from "./skills-install.js";
import {
runCommandWithTimeoutMock,
@@ -36,6 +38,27 @@ metadata: {"openclaw":{"install":[{"id":"deps","kind":"node","package":"example-
return skillDir;
}
const workspaceSuite = createFixtureSuite("openclaw-skills-install-");
let tempHome: TempHomeEnv;
beforeAll(async () => {
tempHome = await createTempHomeEnv("openclaw-skills-install-home-");
await workspaceSuite.setup();
});
afterAll(async () => {
await workspaceSuite.cleanup();
await tempHome.restore();
});
async function withWorkspaceCase(
run: (params: { workspaceDir: string; stateDir: string }) => Promise<void>,
): Promise<void> {
const workspaceDir = await workspaceSuite.createCaseDir("case");
const stateDir = setTempStateDir(workspaceDir);
await run({ workspaceDir, stateDir });
}
describe("installSkill code safety scanning", () => {
beforeEach(() => {
runCommandWithTimeoutMock.mockClear();
@@ -50,7 +73,7 @@ describe("installSkill code safety scanning", () => {
});
it("adds detailed warnings for critical findings and continues install", async () => {
await withTempWorkspace(async ({ workspaceDir }) => {
await withWorkspaceCase(async ({ workspaceDir }) => {
const skillDir = await writeInstallableSkill(workspaceDir, "danger-skill");
scanDirectoryWithSummaryMock.mockResolvedValue({
scannedFiles: 1,
@@ -84,7 +107,7 @@ describe("installSkill code safety scanning", () => {
});
it("warns and continues when skill scan fails", async () => {
await withTempWorkspace(async ({ workspaceDir }) => {
await withWorkspaceCase(async ({ workspaceDir }) => {
await writeInstallableSkill(workspaceDir, "scanfail-skill");
scanDirectoryWithSummaryMock.mockRejectedValue(new Error("scanner exploded"));

View File

@@ -1,15 +1,19 @@
import fs from "node:fs/promises";
import path from "node:path";
import { afterEach, describe, expect, it } from "vitest";
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { withEnv } from "../test-utils/env.js";
import { createTrackedTempDirs } from "../test-utils/tracked-temp-dirs.js";
import { createFixtureSuite } from "../test-utils/fixture-suite.js";
import { writeSkill } from "./skills.e2e-test-helpers.js";
import { buildWorkspaceSkillSnapshot, buildWorkspaceSkillsPrompt } from "./skills.js";
const tempDirs = createTrackedTempDirs();
const fixtureSuite = createFixtureSuite("openclaw-skills-snapshot-suite-");
afterEach(async () => {
await tempDirs.cleanup();
beforeAll(async () => {
await fixtureSuite.setup();
});
afterAll(async () => {
await fixtureSuite.cleanup();
});
function withWorkspaceHome<T>(workspaceDir: string, cb: () => T): T {
@@ -18,7 +22,7 @@ function withWorkspaceHome<T>(workspaceDir: string, cb: () => T): T {
describe("buildWorkspaceSkillSnapshot", () => {
it("returns an empty snapshot when skills dirs are missing", async () => {
const workspaceDir = await tempDirs.make("openclaw-");
const workspaceDir = await fixtureSuite.createCaseDir("workspace");
const snapshot = withWorkspaceHome(workspaceDir, () =>
buildWorkspaceSkillSnapshot(workspaceDir, {
@@ -32,7 +36,7 @@ describe("buildWorkspaceSkillSnapshot", () => {
});
it("omits disable-model-invocation skills from the prompt", async () => {
const workspaceDir = await tempDirs.make("openclaw-");
const workspaceDir = await fixtureSuite.createCaseDir("workspace");
await writeSkill({
dir: path.join(workspaceDir, "skills", "visible-skill"),
name: "visible-skill",
@@ -61,7 +65,7 @@ describe("buildWorkspaceSkillSnapshot", () => {
});
it("keeps prompt output aligned with buildWorkspaceSkillsPrompt", async () => {
const workspaceDir = await tempDirs.make("openclaw-");
const workspaceDir = await fixtureSuite.createCaseDir("workspace");
await writeSkill({
dir: path.join(workspaceDir, "skills", "visible"),
name: "visible",
@@ -106,7 +110,7 @@ describe("buildWorkspaceSkillSnapshot", () => {
});
it("truncates the skills prompt when it exceeds the configured char budget", async () => {
const workspaceDir = await tempDirs.make("openclaw-");
const workspaceDir = await fixtureSuite.createCaseDir("workspace");
// Keep fixture size modest while still forcing truncation logic.
for (let i = 0; i < 8; i += 1) {
@@ -138,8 +142,8 @@ describe("buildWorkspaceSkillSnapshot", () => {
});
it("limits discovery for nested repo-style skills roots (dir/skills/*)", async () => {
const workspaceDir = await tempDirs.make("openclaw-");
const repoDir = await tempDirs.make("openclaw-skills-repo-");
const workspaceDir = await fixtureSuite.createCaseDir("workspace");
const repoDir = await fixtureSuite.createCaseDir("skills-repo");
for (let i = 0; i < 8; i += 1) {
const name = `repo-skill-${String(i).padStart(2, "0")}`;
@@ -175,7 +179,7 @@ describe("buildWorkspaceSkillSnapshot", () => {
});
it("skips skills whose SKILL.md exceeds maxSkillFileBytes", async () => {
const workspaceDir = await tempDirs.make("openclaw-");
const workspaceDir = await fixtureSuite.createCaseDir("workspace");
await writeSkill({
dir: path.join(workspaceDir, "skills", "small-skill"),
@@ -211,8 +215,8 @@ describe("buildWorkspaceSkillSnapshot", () => {
});
it("detects nested skills roots beyond the first 25 entries", async () => {
const workspaceDir = await tempDirs.make("openclaw-");
const repoDir = await tempDirs.make("openclaw-skills-repo-");
const workspaceDir = await fixtureSuite.createCaseDir("workspace");
const repoDir = await fixtureSuite.createCaseDir("skills-repo");
// Create 30 nested dirs, but only the last one is an actual skill.
for (let i = 0; i < 30; i += 1) {
@@ -250,8 +254,8 @@ describe("buildWorkspaceSkillSnapshot", () => {
});
it("enforces maxSkillFileBytes for root-level SKILL.md", async () => {
const workspaceDir = await tempDirs.make("openclaw-");
const rootSkillDir = await tempDirs.make("openclaw-root-skill-");
const workspaceDir = await fixtureSuite.createCaseDir("workspace");
const rootSkillDir = await fixtureSuite.createCaseDir("root-skill");
await writeSkill({
dir: rootSkillDir,

View File

@@ -1,7 +1,7 @@
import fs from "node:fs/promises";
import os from "node:os";
import path from "node:path";
import { afterAll, beforeAll, describe, expect, it } from "vitest";
import { createFixtureSuite } from "../test-utils/fixture-suite.js";
import { createTempHomeEnv, type TempHomeEnv } from "../test-utils/temp-home.js";
import { writeSkill } from "./skills.e2e-test-helpers.js";
import {
@@ -13,7 +13,7 @@ import {
loadWorkspaceSkillEntries,
} from "./skills.js";
const tempDirs: string[] = [];
const fixtureSuite = createFixtureSuite("openclaw-skills-suite-");
let tempHome: TempHomeEnv | null = null;
const resolveTestSkillDirs = (workspaceDir: string) => ({
@@ -21,11 +21,7 @@ const resolveTestSkillDirs = (workspaceDir: string) => ({
bundledSkillsDir: path.join(workspaceDir, ".bundled"),
});
const makeWorkspace = async () => {
const workspaceDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-"));
tempDirs.push(workspaceDir);
return workspaceDir;
};
const makeWorkspace = async () => await fixtureSuite.createCaseDir("workspace");
const withClearedEnv = <T>(
keys: string[],
@@ -52,6 +48,7 @@ const withClearedEnv = <T>(
};
beforeAll(async () => {
await fixtureSuite.setup();
tempHome = await createTempHomeEnv("openclaw-skills-home-");
await fs.mkdir(path.join(tempHome.home, ".openclaw", "agents", "main", "sessions"), {
recursive: true,
@@ -63,10 +60,7 @@ afterAll(async () => {
await tempHome.restore();
tempHome = null;
}
await Promise.all(
tempDirs.splice(0, tempDirs.length).map((dir) => fs.rm(dir, { recursive: true, force: true })),
);
await fixtureSuite.cleanup();
});
describe("buildWorkspaceSkillCommandSpecs", () => {