Mirrors/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-03-29 05:25:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(regression): support contracts surface in test planner

Browse Source
This commit is contained in:
Tak Hoffman
2026-03-27 19:26:33 -05:00
parent 9cb3ce8e1a
commit 835441233d
3 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/test-parallel.mjs
View File

@@ -117,7 +117,7 @@ if (rawCli.showHelp) {
" --plan Print the resolved execution plan and exit",
" --ci-manifest Print the planner-backed CI execution manifest as JSON and exit",
" --explain <file> Explain how a file is classified and run, then exit",
" --surface <name> Select a surface: unit, extensions, channels, gateway",
" --surface <name> Select a surface: unit, extensions, channels, contracts, gateway",
" --files <pattern> Add targeted files or path patterns (repeatable)",
" --mode <ci|local> Override runtime mode",
" --profile <name> Override execution intent: normal, max, serial",

24
scripts/test-planner/planner.mjs
View File

@@ -97,13 +97,13 @@ const normalizeSurfaces = (values = []) => [
),
];
const EXPLICIT_PLAN_SURFACES = new Set(["unit", "extensions", "channels", "gateway"]);
const EXPLICIT_PLAN_SURFACES = new Set(["unit", "extensions", "channels", "contracts", "gateway"]);
const validateExplicitSurfaces = (surfaces) => {
const invalidSurfaces = surfaces.filter((surface) => !EXPLICIT_PLAN_SURFACES.has(surface));
if (invalidSurfaces.length > 0) {
throw new Error(
`Unsupported --surface value(s): ${invalidSurfaces.join(", ")}. Supported surfaces: unit, extensions, channels, gateway.`,
`Unsupported --surface value(s): ${invalidSurfaces.join(", ")}. Supported surfaces: unit, extensions, channels, contracts, gateway.`,
);
}
};
@@ -125,6 +125,9 @@ const buildRequestedSurfaces = (request, env) => {
if (env.OPENCLAW_TEST_INCLUDE_CHANNELS === "1") {
surfaces.push("channels");
}
if (env.OPENCLAW_TEST_INCLUDE_CONTRACTS === "1") {
surfaces.push("contracts");
}
if (env.OPENCLAW_TEST_INCLUDE_GATEWAY === "1") {
surfaces.push("gateway");
}
@@ -288,6 +291,9 @@ const resolveMaxWorkersForUnit = (unit, context) => {
if (unit.surface === "channels") {
return budget.channelSharedWorkers ?? budget.unitSharedWorkers;
}
if (unit.surface === "contracts") {
return budget.unitSharedWorkers;
}
if (unit.surface === "gateway") {
return budget.gatewayWorkers;
}
@@ -383,6 +389,7 @@ const buildDefaultUnits = (context, request) => {
const selectedSurfaceSet = new Set(selectedSurfaces);
const unitOnlyRun = selectedSurfaceSet.size === 1 && selectedSurfaceSet.has("unit");
const channelsOnlyRun = selectedSurfaceSet.size === 1 && selectedSurfaceSet.has("channels");
const contractsOnlyRun = selectedSurfaceSet.size === 1 && selectedSurfaceSet.has("contracts");
const extensionsOnlyRun = selectedSurfaceSet.size === 1 && selectedSurfaceSet.has("extensions");
const {
@@ -612,6 +619,19 @@ const buildDefaultUnits = (context, request) => {
}
}
if (selectedSurfaceSet.has("contracts")) {
units.push(
createExecutionUnit(context, {
id: "contracts",
surface: "contracts",
isolate: false,
serialPhase: contractsOnlyRun ? undefined : "contracts",
args: ["vitest", "run", "--config", "vitest.contracts.config.ts", ...noIsolateArgs],
reasons: ["contracts-shared"],
}),
);
}
if (selectedSurfaceSet.has("extensions")) {
for (const file of catalog.extensionForkIsolatedFiles) {
units.push(

7
test/scripts/test-parallel.test.ts
View File

@@ -483,6 +483,13 @@ describe("scripts/test-parallel lane planning", () => {
);
});
it("supports the explicit contracts surface", () => {
const output = runPlannerPlan(["--plan", "--surface", "contracts"]);
expect(output).toContain("contracts filters=all");
expect(output).toContain("surface=contracts");
});
it("rejects wrapper --files values that look like options", () => {
expect(() => runPlannerPlan(["--plan", "--files", "--config"])).toThrowError(
/Invalid --files value/u,