Skip to content

fix: revive global concurrency limit for test lifecycle [backport to v4] #10992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sheremet-va merged 1 commit into from
Aug 18, 2026
+49 −67
Merged

fix: revive global concurrency limit for test lifecycle [backport to v4] #10992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/runner/src/run.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const now = globalThis.performance ? globalThis.performance.now.bind(globalThis.
const unixNow = Date.now
const { clearTimeout, setTimeout } = getSafeTimers()
let limitMaxConcurrency: ConcurrencyLimiter
let limitTestConcurrency: ConcurrencyLimiter

/**
* Normalizes retry configuration to extract individual values.
Expand Down Expand Up @@ -987,7 +988,7 @@ async function runSuiteChild(c: Task, runner: VitestRunner) {
'code.line.number': c.location?.line,
'code.column.number': c.location?.column,
},
() => runTest(c, runner),
() => limitTestConcurrency(() => runTest(c, runner)),
)
}
else if (c.type === 'suite') {
Expand All @@ -1008,6 +1009,7 @@ async function runSuiteChild(c: Task, runner: VitestRunner) {

export async function runFiles(files: File[], runner: VitestRunner): Promise<void> {
limitMaxConcurrency ??= limitConcurrency(runner.config.maxConcurrency)
limitTestConcurrency ??= limitConcurrency(runner.config.maxConcurrency)

for (const file of files) {
if (!file.tasks.length && !runner.config.passWithNoTests) {
Expand Down
112 changes: 46 additions & 66 deletions test/cli/test/concurrent.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,7 +1076,7 @@ test('aroundAll enforces teardown timeout when inner error is caught', async ()
})

function extractLogs(log: string) {
const result = log.split('\n').filter(line => line.match(/^![<>]/)).join('\n')
const result = log.split('\n').filter(line => line.match(/^(?:![<>]|\d+ -> \d+)/)).join('\n')
return `\n${result.trim()}\n`
}

Expand Down Expand Up @@ -1194,33 +1194,33 @@ describe.for(["a", "b"])("%s", { concurrent: true }, () => {
`)
})

// we could enforce this by adding yet another limit globally at `runTest`
// (like we originally had before https://github.com/vitest-dev/vitest/pull/9653)
// but there's no way to achieve the same for deep suite-level hooks anyways,
// so we don't do that (yet).
test('non-sibling test sequential lifecycle non-guarantee', async () => {
test('non-sibling test sequential lifecycle guarantee', async () => {
const result = await runInlineTests({
'basic.test.ts': `
const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms))
let inFlight = 0

function logInFlight(change: number, ...names: string[]) {
const previous = inFlight
inFlight += change
console.log(previous, "->", inFlight, ...names)
}

describe.for(["a0", "a1"])("%s", { concurrent: true }, () => {
describe.for(["b0", "b1"])("%s", { concurrent: true }, () => {
beforeEach(async ({ task }) => {
console.log("!> beforeEach", task.suite.suite.name, task.suite.name, task.name)
logInFlight(1, "beforeEach", task.suite.suite.name, task.suite.name, task.name)
await sleep(10)
console.log("!< beforeEach", task.suite.suite.name, task.suite.name, task.name)
})

afterEach(async ({ task }) => {
console.log("!> afterEach", task.suite.suite.name, task.suite.name, task.name)
await sleep(10)
console.log("!< afterEach", task.suite.suite.name, task.suite.name, task.name)
logInFlight(-1, "afterEach", task.suite.suite.name, task.suite.name, task.name)
})

test("test", async ({ task }) => {
console.log("!> test", task.suite.suite.name,task.suite.name, task.name)
logInFlight(0, "test", task.suite.suite.name, task.suite.name, task.name)
await sleep(10)
console.log("!< test", task.suite.suite.name,task.suite.name, task.name)
})
})
})
Expand All @@ -1232,30 +1232,18 @@ describe.for(["a0", "a1"])("%s", { concurrent: true }, () => {

expect(extractLogs(result.stdout)).toMatchInlineSnapshot(`
"
!> beforeEach a0 b0 test
!> beforeEach a0 b1 test
!< beforeEach a0 b0 test
!> beforeEach a1 b0 test
!< beforeEach a0 b1 test
!> beforeEach a1 b1 test
!< beforeEach a1 b0 test
!> test a0 b0 test
!< beforeEach a1 b1 test
!> test a0 b1 test
!< test a0 b0 test
!> test a1 b0 test
!< test a0 b1 test
!> test a1 b1 test
!< test a1 b0 test
!> afterEach a0 b0 test
!< test a1 b1 test
!> afterEach a0 b1 test
!< afterEach a0 b0 test
!> afterEach a1 b0 test
!< afterEach a0 b1 test
!> afterEach a1 b1 test
!< afterEach a1 b0 test
!< afterEach a1 b1 test
0 -> 1 beforeEach a0 b0 test
1 -> 2 beforeEach a0 b1 test
2 -> 2 test a0 b0 test
2 -> 2 test a0 b1 test
2 -> 1 afterEach a0 b0 test
1 -> 2 beforeEach a1 b0 test
2 -> 1 afterEach a0 b1 test
1 -> 2 beforeEach a1 b1 test
2 -> 2 test a1 b0 test
2 -> 2 test a1 b1 test
2 -> 1 afterEach a1 b0 test
1 -> 0 afterEach a1 b1 test
"
`)

Expand Down Expand Up @@ -1287,25 +1275,29 @@ test('non-sibling suite sequential lifecycle non-guarantee', async () => {
const result = await runInlineTests({
'basic.test.ts': `
const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms))
let inFlight = 0

function logInFlight(change: number, ...names: string[]) {
const previous = inFlight
inFlight += change
console.log(previous, "->", inFlight, ...names)
}

describe.for(["a0", "a1"])("%s", { concurrent: true }, () => {
describe.for(["b0", "b1"])("%s", { concurrent: true }, () => {
beforeAll(async ({}, suite) => {
console.log("!> beforeAll", suite.suite.name, suite.name)
logInFlight(1, "beforeAll", suite.suite.name, suite.name)
await sleep(10)
console.log("!< beforeAll", suite.suite.name, suite.name)
})

afterAll(async ({}, suite) => {
console.log("!> afterAll", suite.suite.name, suite.name)
await sleep(10)
console.log("!< afterAll", suite.suite.name, suite.name)
logInFlight(-1, "afterAll", suite.suite.name, suite.name)
})

test("test", async ({ task }) => {
console.log("!> test", task.suite.suite.name, task.suite.name, task.name)
logInFlight(0, "test", task.suite.suite.name, task.suite.name, task.name)
await sleep(10)
console.log("!< test", task.suite.suite.name, task.suite.name, task.name)
})
})
})
Expand All @@ -1317,30 +1309,18 @@ describe.for(["a0", "a1"])("%s", { concurrent: true }, () => {

expect(extractLogs(result.stdout)).toMatchInlineSnapshot(`
"
!> beforeAll a0 b0
!> beforeAll a0 b1
!< beforeAll a0 b0
!> beforeAll a1 b0
!< beforeAll a0 b1
!> beforeAll a1 b1
!< beforeAll a1 b0
!> test a0 b0 test
!< beforeAll a1 b1
!> test a0 b1 test
!< test a0 b0 test
!> test a1 b0 test
!< test a0 b1 test
!> test a1 b1 test
!< test a1 b0 test
!> afterAll a0 b0
!< test a1 b1 test
!> afterAll a0 b1
!< afterAll a0 b0
!> afterAll a1 b0
!< afterAll a0 b1
!> afterAll a1 b1
!< afterAll a1 b0
!< afterAll a1 b1
0 -> 1 beforeAll a0 b0
1 -> 2 beforeAll a0 b1
2 -> 3 beforeAll a1 b0
3 -> 4 beforeAll a1 b1
4 -> 4 test a0 b0 test
4 -> 4 test a0 b1 test
4 -> 4 test a1 b0 test
4 -> 4 test a1 b1 test
4 -> 3 afterAll a0 b0
3 -> 2 afterAll a0 b1
2 -> 1 afterAll a1 b0
1 -> 0 afterAll a1 b1
"
`)

Expand Down
Loading