github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-08 04:41:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(test): simplify state dir env restore

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-15 23:29:56 +00:00
parent 35ab521e07
commit f0e373b82e
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/media/store.redirect.test.ts
View File

@@ -4,14 +4,17 @@ import os from "node:os";
import path from "node:path"; import path from "node:path";
import { PassThrough } from "node:stream"; import { PassThrough } from "node:stream";
import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from "vitest"; import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
import { captureEnv } from "../test-utils/env.js";
import { saveMediaSource, setMediaStoreNetworkDepsForTest } from "./store.js"; import { saveMediaSource, setMediaStoreNetworkDepsForTest } from "./store.js";
const HOME = path.join(os.tmpdir(), "openclaw-home-redirect"); const HOME = path.join(os.tmpdir(), "openclaw-home-redirect");
const previousStateDir = process.env.OPENCLAW_STATE_DIR;
const mockRequest = vi.fn(); const mockRequest = vi.fn();
describe("media store redirects", () => { describe("media store redirects", () => {
let envSnapshot: ReturnType<typeof captureEnv>;
beforeAll(async () => { beforeAll(async () => {
envSnapshot = captureEnv(["OPENCLAW_STATE_DIR"]);
await fs.rm(HOME, { recursive: true, force: true }); await fs.rm(HOME, { recursive: true, force: true });
process.env.OPENCLAW_STATE_DIR = HOME; process.env.OPENCLAW_STATE_DIR = HOME;
}); });
@@ -29,11 +32,7 @@ describe("media store redirects", () => {
afterAll(async () => { afterAll(async () => {
await fs.rm(HOME, { recursive: true, force: true }); await fs.rm(HOME, { recursive: true, force: true });
if (previousStateDir === undefined) { envSnapshot.restore();
delete process.env.OPENCLAW_STATE_DIR;
} else {
process.env.OPENCLAW_STATE_DIR = previousStateDir;
}
setMediaStoreNetworkDepsForTest(); setMediaStoreNetworkDepsForTest();
vi.clearAllMocks(); vi.clearAllMocks();
}); });

11
src/web/media.test.ts
View File

@@ -5,6 +5,7 @@ import sharp from "sharp";
import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from "vitest"; import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from "vitest";
import * as ssrf from "../infra/net/ssrf.js"; import * as ssrf from "../infra/net/ssrf.js";
import { optimizeImageToPng } from "../media/image-ops.js"; import { optimizeImageToPng } from "../media/image-ops.js";
import { captureEnv } from "../test-utils/env.js";
import { loadWebMedia, loadWebMediaRaw, optimizeImageToJpeg } from "./media.js"; import { loadWebMedia, loadWebMediaRaw, optimizeImageToJpeg } from "./media.js";
let fixtureRoot = ""; let fixtureRoot = "";
@@ -19,7 +20,7 @@ let alphaPngFile = "";
let fallbackPngBuffer: Buffer; let fallbackPngBuffer: Buffer;
let fallbackPngFile = ""; let fallbackPngFile = "";
let fallbackPngCap = 0; let fallbackPngCap = 0;
let previousStateDir: string | undefined; let stateDirSnapshot: ReturnType<typeof captureEnv>;
async function writeTempFile(buffer: Buffer, ext: string): Promise<string> { async function writeTempFile(buffer: Buffer, ext: string): Promise<string> {
const file = path.join(fixtureRoot, `media-${fixtureFileCount++}${ext}`); const file = path.join(fixtureRoot, `media-${fixtureFileCount++}${ext}`);
@@ -100,7 +101,7 @@ describe("web media loading", () => {
beforeAll(() => { beforeAll(() => {
// Ensure state dir is stable and not influenced by other tests that stub OPENCLAW_STATE_DIR. // Ensure state dir is stable and not influenced by other tests that stub OPENCLAW_STATE_DIR.
// Also keep it outside os.tmpdir() so tmpdir localRoots doesn't accidentally make all state readable. // Also keep it outside os.tmpdir() so tmpdir localRoots doesn't accidentally make all state readable.
previousStateDir = process.env.OPENCLAW_STATE_DIR; stateDirSnapshot = captureEnv(["OPENCLAW_STATE_DIR"]);
process.env.OPENCLAW_STATE_DIR = path.join( process.env.OPENCLAW_STATE_DIR = path.join(
path.parse(os.tmpdir()).root, path.parse(os.tmpdir()).root,
"var", "var",
@@ -110,11 +111,7 @@ describe("web media loading", () => {
}); });
afterAll(() => { afterAll(() => {
if (previousStateDir === undefined) { stateDirSnapshot.restore();
delete process.env.OPENCLAW_STATE_DIR;
} else {
process.env.OPENCLAW_STATE_DIR = previousStateDir;
}
}); });
beforeAll(() => { beforeAll(() => {