Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 9 additions & 6 deletions packages/vitest/src/node/pools/pool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,21 @@ export class Pool {
}

runner.off('message', onFinished)
runner.off('error', onTaskError)
resolver.resolve()
}
}

function onTaskError(error: unknown) {
runner.off('message', onFinished)
runner.off('error', onTaskError)
resolver.reject(new Error(`[vitest-pool]: Worker ${task.worker} emitted error.`, { cause: error }))
}

runner.on('message', onFinished)
runner.on('error', onTaskError)

if (!runner.isStarted) {
runner.on('error', (error) => {
resolver.reject(
new Error(`[vitest-pool]: Worker ${task.worker} emitted error.`, { cause: error }),
)
})

const id = setTimeout(
() => resolver.reject(new Error(`[vitest-pool]: Timeout starting ${task.worker} runner.`)),
WORKER_START_TIMEOUT,
Expand Down Expand Up @@ -148,6 +150,7 @@ export class Pool {

if (
!task.isolate
&& !runner.isTerminated
&& !isMemoryLimitReached
&& this.queue[0]?.task.isolate === false
&& isEqualRunner(runner, this.queue[0].task)
Expand Down
1 change: 1 addition & 0 deletions packages/vitest/src/node/pools/poolRunner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,7 @@ export class PoolRunner {

private emitUnexpectedExit = (): void => {
const error = new Error('Worker exited unexpectedly')
this._state = RunnerState.STOPPED

this._eventEmitter.emit('error', error)
}
Expand Down
6 changes: 6 additions & 0 deletions test/cli/fixtures/pool-worker-exit/1-first.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { expect, test } from 'vitest'
import { covered } from './src'

test('first test exercises src so it should appear in coverage', () => {
expect(covered()).toBe(42)
})
8 changes: 8 additions & 0 deletions test/cli/fixtures/pool-worker-exit/2-crash.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { test } from 'vitest'

test('the worker dies before sending testfileFinished', async () => {
// SIGKILL the worker process so it can't send testfileFinished back to main.
// Pre-fix this caused pool.run() to hang forever instead of rejecting.
queueMicrotask(() => process.kill(process.pid, 'SIGKILL'))
await new Promise(() => {})
})
8 changes: 8 additions & 0 deletions test/cli/fixtures/pool-worker-exit/3-crash.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { test } from 'vitest'

test('the worker dies before sending testfileFinished', async () => {
// SIGKILL the worker process so it can't send testfileFinished back to main.
// Pre-fix this caused pool.run() to hang forever instead of rejecting.
queueMicrotask(() => process.kill(process.pid, 'SIGKILL'))
await new Promise(() => {})
})
6 changes: 6 additions & 0 deletions test/cli/fixtures/pool-worker-exit/4-third.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { expect, test } from 'vitest'
import { covered } from './src.js'

test('third test', () => {
expect(covered()).toBe(42)
})
7 changes: 7 additions & 0 deletions test/cli/fixtures/pool-worker-exit/src.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export function covered() {
return 42
}

export function uncovered() {
return 42
}
71 changes: 71 additions & 0 deletions test/cli/test/pool-worker-exit.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import { runVitest, StableTestFileOrderSorter } from '#test-utils'
import { resolve } from 'pathe'
import { expect, test } from 'vitest'
import { readCoverageMap } from '../../coverage-test/utils'

test('worker death on a shared runner does not skip coverage finalization', async () => {
const root = './fixtures/pool-worker-exit'

const { buildTree } = await runVitest({
root,
pool: 'forks',

// Disable isolation to make sure crashed worker doesn't hang whole test run
isolate: false,
maxWorkers: 2,

sequence: { sequencer: StableTestFileOrderSorter },
include: [
'1-first.test.ts',
'2-crash.test.ts',
'3-crash.test.ts',
'4-third.test.ts',
],

reporters: 'default',
coverage: {
enabled: true,
provider: 'v8',
reporter: ['json'],
reportOnFailure: true,
},
})

expect(buildTree(t => ({ state: t.result().state }))).toMatchInlineSnapshot(`
{
"1-first.test.ts": {
"first test exercises src so it should appear in coverage": {
"state": "passed",
},
},
"2-crash.test.ts": {
"the worker dies before sending testfileFinished": {
"state": "pending",
},
},
"3-crash.test.ts": {
"the worker dies before sending testfileFinished": {
"state": "pending",
},
},
"4-third.test.ts": {
"third test": {
"state": "passed",
},
},
}
`)

// Crashing worker should not interfere with other test-run, coverage should be reported:
const coverageMap = await readCoverageMap(resolve(root, 'coverage/coverage-final.json'))
const fileCoverage = coverageMap.fileCoverageFor('<process-cwd>/fixtures/pool-worker-exit/src.ts')

expect(fileCoverage.toSummary().functions).toMatchInlineSnapshot(`
{
"covered": 1,
"pct": 50,
"skipped": 0,
"total": 2,
}
`)
})
Loading