From 8b7ba0e481f24db2b2846617e280cd393aaa78f4 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Fri, 10 Apr 2026 23:04:29 +0100 Subject: [PATCH] test: keep unit-fast single shard --- scripts/test-projects.mjs | 2 -- test/vitest/vitest.full-core-unit-fast.config.ts | 5 +---- test/vitest/vitest.shared.config.ts | 2 -- test/vitest/vitest.test-shards.mjs | 5 +---- test/vitest/vitest.unit-fast-a.config.ts | 7 ------- test/vitest/vitest.unit-fast-b.config.ts | 7 ------- test/vitest/vitest.unit-fast-paths.mjs | 13 ------------- test/vitest/vitest.unit-fast.config.ts | 6 +++--- 8 files changed, 5 insertions(+), 42 deletions(-) delete mode 100644 test/vitest/vitest.unit-fast-a.config.ts delete mode 100644 test/vitest/vitest.unit-fast-b.config.ts diff --git a/scripts/test-projects.mjs b/scripts/test-projects.mjs index 47f6df2b668..24d9c5c2a48 100644 --- a/scripts/test-projects.mjs +++ b/scripts/test-projects.mjs @@ -40,8 +40,6 @@ const FULL_SUITE_CONFIG_WEIGHT = new Map([ ["test/vitest/vitest.contracts.config.ts", 165], ["test/vitest/vitest.tasks.config.ts", 165], ["test/vitest/vitest.channels.config.ts", 164], - ["test/vitest/vitest.unit-fast-a.config.ts", 161], - ["test/vitest/vitest.unit-fast-b.config.ts", 161], ["test/vitest/vitest.unit-fast.config.ts", 160], ["test/vitest/vitest.auto-reply-reply.config.ts", 155], ["test/vitest/vitest.infra.config.ts", 145], diff --git a/test/vitest/vitest.full-core-unit-fast.config.ts b/test/vitest/vitest.full-core-unit-fast.config.ts index bff01e06e34..74c74d9fe6e 100644 --- a/test/vitest/vitest.full-core-unit-fast.config.ts +++ b/test/vitest/vitest.full-core-unit-fast.config.ts @@ -6,9 +6,6 @@ export default defineConfig({ test: { ...sharedVitestConfig.test, runner: undefined, - projects: [ - "test/vitest/vitest.unit-fast-a.config.ts", - "test/vitest/vitest.unit-fast-b.config.ts", - ], + projects: ["test/vitest/vitest.unit-fast.config.ts"], }, }); diff --git a/test/vitest/vitest.shared.config.ts b/test/vitest/vitest.shared.config.ts index 4309b44c345..ecbcdda5a20 100644 --- a/test/vitest/vitest.shared.config.ts +++ b/test/vitest/vitest.shared.config.ts @@ -266,8 +266,6 @@ export const sharedVitestConfig = { "test/vitest/vitest.media.config.ts", "test/vitest/vitest.media-understanding.config.ts", "test/vitest/vitest.performance-config.ts", - "test/vitest/vitest.unit-fast-a.config.ts", - "test/vitest/vitest.unit-fast-b.config.ts", "test/vitest/vitest.unit-fast.config.ts", "test/vitest/vitest.unit-fast-paths.mjs", "test/vitest/vitest.scoped-config.ts", diff --git a/test/vitest/vitest.test-shards.mjs b/test/vitest/vitest.test-shards.mjs index 911e70a92c2..87c3ff7a489 100644 --- a/test/vitest/vitest.test-shards.mjs +++ b/test/vitest/vitest.test-shards.mjs @@ -10,10 +10,7 @@ export const fullSuiteVitestShards = [ { config: "test/vitest/vitest.full-core-unit-fast.config.ts", name: "core-unit-fast", - projects: [ - "test/vitest/vitest.unit-fast-a.config.ts", - "test/vitest/vitest.unit-fast-b.config.ts", - ], + projects: ["test/vitest/vitest.unit-fast.config.ts"], }, { config: "test/vitest/vitest.full-core-unit-src.config.ts", diff --git a/test/vitest/vitest.unit-fast-a.config.ts b/test/vitest/vitest.unit-fast-a.config.ts deleted file mode 100644 index 3d25f0ddf8d..00000000000 --- a/test/vitest/vitest.unit-fast-a.config.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { partitionUnitFastTestFiles } from "./vitest.unit-fast-paths.mjs"; -import { createUnitFastVitestConfig } from "./vitest.unit-fast.config.ts"; - -export default createUnitFastVitestConfig(process.env, { - include: partitionUnitFastTestFiles(0, 2), - name: "unit-fast-a", -}); diff --git a/test/vitest/vitest.unit-fast-b.config.ts b/test/vitest/vitest.unit-fast-b.config.ts deleted file mode 100644 index 32aa6e405d7..00000000000 --- a/test/vitest/vitest.unit-fast-b.config.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { partitionUnitFastTestFiles } from "./vitest.unit-fast-paths.mjs"; -import { createUnitFastVitestConfig } from "./vitest.unit-fast.config.ts"; - -export default createUnitFastVitestConfig(process.env, { - include: partitionUnitFastTestFiles(1, 2), - name: "unit-fast-b", -}); diff --git a/test/vitest/vitest.unit-fast-paths.mjs b/test/vitest/vitest.unit-fast-paths.mjs index 7d9117c3ab5..34ead658bf6 100644 --- a/test/vitest/vitest.unit-fast-paths.mjs +++ b/test/vitest/vitest.unit-fast-paths.mjs @@ -212,19 +212,6 @@ export const unitFastTestFiles = collectUnitFastTestFileAnalysis() .filter((entry) => entry.unitFast) .map((entry) => entry.file); -export function partitionUnitFastTestFiles(index, total) { - if ( - !Number.isInteger(index) || - !Number.isInteger(total) || - total < 1 || - index < 0 || - index >= total - ) { - throw new Error(`invalid unit-fast partition ${index}/${total}`); - } - return unitFastTestFiles.filter((_file, fileIndex) => fileIndex % total === index); -} - const unitFastTestFileSet = new Set(unitFastTestFiles); const sourceToUnitFastTestFile = new Map( [...pluginSdkLightSourceFiles, ...commandsLightSourceFiles].flatMap((sourceFile) => { diff --git a/test/vitest/vitest.unit-fast.config.ts b/test/vitest/vitest.unit-fast.config.ts index fd3c0c404b6..b26f9c44b27 100644 --- a/test/vitest/vitest.unit-fast.config.ts +++ b/test/vitest/vitest.unit-fast.config.ts @@ -5,7 +5,7 @@ import { unitFastTestFiles } from "./vitest.unit-fast-paths.mjs"; export function createUnitFastVitestConfig( env: Record = process.env, - options: { argv?: string[]; include?: string[]; name?: string } = {}, + options: { argv?: string[] } = {}, ) { const sharedTest = sharedVitestConfig.test ?? {}; const includeFromEnv = loadPatternListFromEnv("OPENCLAW_VITEST_INCLUDE_FILE", env); @@ -15,11 +15,11 @@ export function createUnitFastVitestConfig( ...sharedVitestConfig, test: { ...sharedTest, - name: options.name ?? "unit-fast", + name: "unit-fast", isolate: false, runner: undefined, setupFiles: [], - include: includeFromEnv ?? cliInclude ?? options.include ?? unitFastTestFiles, + include: includeFromEnv ?? cliInclude ?? unitFastTestFiles, exclude: sharedTest.exclude ?? [], passWithNoTests: true, },