vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-07-24 02:41:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: isolate provider auth parity suite (#107167)

Browse Source
This commit is contained in:
Peter Steinberger
2026-07-14 00:16:49 -07:00
committed by GitHub
parent 84500db379
commit 69a578034f
10 changed files with 61 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/lib/ci-node-test-plan.mjs
View File

@@ -2,6 +2,7 @@
import { relative } from "node:path";
import { commandsLightTestFiles } from "../../test/vitest/vitest.commands-light-paths.mjs";
import { fullSuiteVitestShards } from "../../test/vitest/vitest.test-shards.mjs";
import { toolingIsolatedTestFiles } from "../../test/vitest/vitest.tooling-isolated-paths.mjs";
import { getUnitFastTestFilesForIncludePatterns } from "../../test/vitest/vitest.unit-fast-paths.mjs";
import { boundaryTestFiles } from "../../test/vitest/vitest.unit-paths.mjs";
import { listTrackedTestFiles } from "./list-test-files.mjs";
@@ -34,7 +35,6 @@ const COMPACT_WHOLE_NODE_TEST_TIMEOUT_MINUTES = 120;
const TOOLING_CONFIG = "test/vitest/vitest.tooling.config.ts";
const TOOLING_DOCKER_TEST_FILE = "test/scripts/docker-build-helper.test.ts";
const TOOLING_ISOLATED_CONFIG = "test/vitest/vitest.tooling-isolated.config.ts";
const TOOLING_ISOLATED_TEST_FILE = "test/scripts/openclaw-e2e-instance.test.ts";
// The full matrix is capped at 28 jobs. Admit the consistently slow serial
// shards first so short alphabetical groups cannot leave them on the tail.
const FULL_NODE_TEST_ADMISSION_PRIORITY = new Map([
@@ -1045,7 +1045,7 @@ function listCompactToolingTestFiles() {
...boundaryTestFiles,
...unitFastFiles,
TOOLING_DOCKER_TEST_FILE,
TOOLING_ISOLATED_TEST_FILE,
...toolingIsolatedTestFiles,
]);
return [...listTestFiles("test"), ...listTestFiles("src/scripts")].filter(
(file) =>

3
scripts/run-vitest.mjs
View File

@@ -5,6 +5,7 @@ import fs from "node:fs";
import { createRequire } from "node:module";
import path from "node:path";
import { fileURLToPath } from "node:url";
import { toolingIsolatedTestFiles } from "../test/vitest/vitest.tooling-isolated-paths.mjs";
import { isUiTestTarget } from "../test/vitest/vitest.ui-paths.mjs";
import { boundaryTestFiles } from "../test/vitest/vitest.unit-paths.mjs";
import { resolveLocalVitestEnv } from "./lib/vitest-local-scheduling.mjs";
@@ -56,7 +57,7 @@ export const VITEST_CONFIG_NO_OUTPUT_TIMEOUT_MS = new Map([
export const TOOLING_EXCLUDED_TESTS = new Set([
...boundaryTestFiles,
"test/scripts/docker-build-helper.test.ts",
"test/scripts/openclaw-e2e-instance.test.ts",
...toolingIsolatedTestFiles,
]);
const EXPLICIT_FILE_TARGET_RE = /\.(?:[cm]?[jt]sx?)$/u;
const EXPLICIT_TEST_FILE_RE = /\.(?:test|e2e|live)\.(?:[cm]?[jt]sx?)$/u;

31
scripts/test-projects.test-support.mjs
View File

@@ -42,6 +42,10 @@ import {
resolvePluginSdkLightIncludePattern,
} from "../test/vitest/vitest.plugin-sdk-paths.mjs";
import { fullSuiteVitestShards } from "../test/vitest/vitest.test-shards.mjs";
import {
isToolingIsolatedTestFile,
toolingIsolatedTestFiles,
} from "../test/vitest/vitest.tooling-isolated-paths.mjs";
import {
getUnitFastTestFiles,
getUnitFastTimerTestFiles,
@@ -285,7 +289,6 @@ const TOOLING_DOCKER_VITEST_CONFIG = "test/vitest/vitest.tooling-docker.config.t
const TOOLING_ISOLATED_VITEST_CONFIG = "test/vitest/vitest.tooling-isolated.config.ts";
const TOOLING_VITEST_CONFIG = "test/vitest/vitest.tooling.config.ts";
const TOOLING_DOCKER_TEST_TARGET = "test/scripts/docker-build-helper.test.ts";
const TOOLING_ISOLATED_TEST_TARGET = "test/scripts/openclaw-e2e-instance.test.ts";
const BROAD_TOOLING_SCRIPT_TEST_PATTERNS = new Set([
"test/scripts/**/*.test.ts",
"test/scripts/*.test.ts",
@@ -3864,7 +3867,7 @@ function classifyTarget(arg, cwd) {
if (isBoundaryTestFile(relative)) {
return "boundary";
}
if (relative === TOOLING_ISOLATED_TEST_TARGET) {
if (isToolingIsolatedTestFile(relative)) {
return "toolingIsolated";
}
if (relative === TOOLING_DOCKER_TEST_TARGET) {
@@ -4128,19 +4131,21 @@ export function buildVitestRunPlans(
groupedTargets.set("toolingDocker", current);
}
}
if (
!watchMode &&
toolingTargets.some((targetArg) =>
includePatternMatchesAnyFile(toScopedIncludePattern(targetArg, cwd), [
TOOLING_ISOLATED_TEST_TARGET,
]),
)
) {
const impliedToolingIsolatedTargets = !watchMode
? toolingIsolatedTestFiles.filter((file) =>
toolingTargets.some((targetArg) =>
includePatternMatchesAnyFile(toScopedIncludePattern(targetArg, cwd), [file]),
),
)
: [];
if (impliedToolingIsolatedTargets.length > 0) {
const current = groupedTargets.get("toolingIsolated") ?? [];
if (!current.includes(TOOLING_ISOLATED_TEST_TARGET)) {
current.push(TOOLING_ISOLATED_TEST_TARGET);
groupedTargets.set("toolingIsolated", current);
for (const target of impliedToolingIsolatedTargets) {
if (!current.includes(target)) {
current.push(target);
}
}
groupedTargets.set("toolingIsolated", current);
}
if (watchMode && groupedTargets.size > 1) {

7
test/scripts/run-vitest.test.ts
View File

@@ -187,8 +187,11 @@ describe("scripts/run-vitest", () => {
]);
});
it("keeps tooling-excluded explicit tests on existing routing", () => {
const argv = ["run", "test/scripts/openclaw-e2e-instance.test.ts"];
it.each([
"test/plugins/bundled-provider-auth-literal-parity.test.ts",
"test/scripts/openclaw-e2e-instance.test.ts",
])("keeps tooling-excluded explicit test %s on existing routing", (testFile) => {
const argv = ["run", testFile];
expect(resolveImplicitVitestArgs(argv)).toBe(argv);
});

13
test/scripts/test-projects.test.ts
View File

@@ -2453,6 +2453,19 @@ describe("scripts/test-projects changed-target routing", () => {
]);
});
it("routes the bundled provider auth parity test to the isolated tooling shard", () => {
expect(
buildVitestRunPlans(["test/plugins/bundled-provider-auth-literal-parity.test.ts"]),
).toEqual([
{
config: "test/vitest/vitest.tooling-isolated.config.ts",
forwardedArgs: [],
includePatterns: ["test/plugins/bundled-provider-auth-literal-parity.test.ts"],
watchMode: false,
},
]);
});
it("routes Docker E2E script targets to their owner tooling tests", () => {
const targets = [
"scripts/e2e/kitchen-sink-plugin-docker.sh",

7
test/vitest-scoped-config.test.ts
View File

@@ -69,6 +69,7 @@ import {
createToolingDockerVitestConfig,
toolingDockerTestFiles,
} from "./vitest/vitest.tooling-docker.config.ts";
import { toolingIsolatedTestFiles } from "./vitest/vitest.tooling-isolated-paths.mjs";
import { createToolingIsolatedVitestConfig } from "./vitest/vitest.tooling-isolated.config.ts";
import { createToolingVitestConfig } from "./vitest/vitest.tooling.config.ts";
import { createTuiVitestConfig } from "./vitest/vitest.tui.config.ts";
@@ -1094,7 +1095,7 @@ describe("scoped vitest configs", () => {
const testConfig = requireTestConfig(defaultToolingConfig);
expect(testConfig.include).toEqual(["test/**/*.test.ts", "src/scripts/**/*.test.ts"]);
expect(testConfig.exclude).toEqual(expect.arrayContaining(toolingDockerTestFiles));
expect(testConfig.exclude).toContain("test/scripts/openclaw-e2e-instance.test.ts");
expect(testConfig.exclude).toEqual(expect.arrayContaining(toolingIsolatedTestFiles));
expect(testConfig.include).not.toContain("src/config/doc-baseline.integration.test.ts");
});
@@ -1104,9 +1105,9 @@ describe("scoped vitest configs", () => {
expect(testConfig.fileParallelism).toBe(false);
});
it("runs shell helper tooling tests isolated from shared mocks", () => {
it("runs state-sensitive tooling tests isolated from shared mocks", () => {
const testConfig = requireTestConfig(createToolingIsolatedVitestConfig({}));
expect(testConfig.include).toEqual(["test/scripts/openclaw-e2e-instance.test.ts"]);
expect(testConfig.include).toEqual(toolingIsolatedTestFiles);
expect(testConfig.isolate).toBe(true);
expect(testConfig.runner).toBeUndefined();
});

2
test/vitest/vitest.tooling-isolated-paths.d.mts Normal file
View File

@@ -0,0 +1,2 @@
export const toolingIsolatedTestFiles: string[];
export function isToolingIsolatedTestFile(file: string): boolean;

11
test/vitest/vitest.tooling-isolated-paths.mjs Normal file
View File

@@ -0,0 +1,11 @@
// Tooling tests that need fresh module or process state instead of the shared serial worker.
export const toolingIsolatedTestFiles = [
"test/plugins/bundled-provider-auth-literal-parity.test.ts",
"test/scripts/openclaw-e2e-instance.test.ts",
];
const toolingIsolatedTestFileSet = new Set(toolingIsolatedTestFiles);
export function isToolingIsolatedTestFile(value) {
return toolingIsolatedTestFileSet.has(value.replaceAll("\\", "/"));
}

3
test/vitest/vitest.tooling-isolated.config.ts
View File

@@ -1,8 +1,9 @@
// Vitest tooling isolated config wires the tooling isolated test shard.
import { createScopedVitestConfig } from "./vitest.scoped-config.ts";
import { toolingIsolatedTestFiles } from "./vitest.tooling-isolated-paths.mjs";
export function createToolingIsolatedVitestConfig(env?: Record<string, string | undefined>) {
return createScopedVitestConfig(["test/scripts/openclaw-e2e-instance.test.ts"], {
return createScopedVitestConfig(toolingIsolatedTestFiles, {
env,
isolate: true,
name: "tooling-isolated",

7
test/vitest/vitest.tooling.config.ts
View File

@@ -2,6 +2,7 @@
import { loadPatternListFromEnv } from "./vitest.pattern-file.ts";
import { createScopedVitestConfig } from "./vitest.scoped-config.ts";
import { toolingDockerTestFiles } from "./vitest.tooling-docker.config.ts";
import { toolingIsolatedTestFiles } from "./vitest.tooling-isolated-paths.mjs";
import { boundaryTestFiles } from "./vitest.unit-paths.mjs";
export function loadIncludePatternsFromEnv(
@@ -15,11 +16,7 @@ export function createToolingVitestConfig(env?: Record<string, string | undefine
loadIncludePatternsFromEnv(env) ?? ["test/**/*.test.ts", "src/scripts/**/*.test.ts"],
{
env,
exclude: [
...boundaryTestFiles,
...toolingDockerTestFiles,
"test/scripts/openclaw-e2e-instance.test.ts",
],
exclude: [...boundaryTestFiles, ...toolingDockerTestFiles, ...toolingIsolatedTestFiles],
fileParallelism: false,
includeOpenClawRuntimeSetup: false,
name: "tooling",