fix(vitest): gracefully exit Vitest if process.exit is called insid…

…e the test (#4903)
vitest-dev · Jan 9, 2024 · 8e6c104 · 8e6c104
1 parent 043b78f
commit 8e6c104
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 15 deletions.
diff --git a/packages/vitest/src/node/error.ts b/packages/vitest/src/node/error.ts
@@ -59,8 +59,7 @@ export async function printError(error: unknown, project: WorkspaceProject | und
   const nearest = error instanceof TypeCheckError
     ? error.stacks[0]
     : stacks.find(stack =>
-      project.getModuleById(stack.file)
-      && existsSync(stack.file),
+      project.server && project.getModuleById(stack.file) && existsSync(stack.file),
     )
 
   const errorProperties = getErrorProperties(e)

diff --git a/packages/vitest/src/node/pools/rpc.ts b/packages/vitest/src/node/pools/rpc.ts
@@ -5,10 +5,6 @@ import type { WorkspaceProject } from '../workspace'
 export function createMethodsRPC(project: WorkspaceProject): RuntimeRPC {
   const ctx = project.ctx
   return {
-    async onWorkerExit(error, code) {
-      await ctx.logger.printError(error, { type: 'Unexpected Exit', fullStack: true })
-      process.exit(code || 1)
-    },
     snapshotSaved(snapshot) {
       ctx.snapshot.add(snapshot)
     },

diff --git a/packages/vitest/src/runtime/child.ts b/packages/vitest/src/runtime/child.ts
@@ -34,7 +34,7 @@ async function init(ctx: ChildContext) {
       onCancel: setCancel,
     },
     {
-      eventNames: ['onUserConsoleLog', 'onFinished', 'onCollected', 'onWorkerExit', 'onCancel'],
+      eventNames: ['onUserConsoleLog', 'onFinished', 'onCollected', 'onCancel'],
       serialize: v8.serialize,
       deserialize: v => v8.deserialize(Buffer.from(v)),
       post(v) {

diff --git a/packages/vitest/src/runtime/execute.ts b/packages/vitest/src/runtime/execute.ts
@@ -70,12 +70,8 @@ export async function startVitestExecutor(options: ContextExecutorOptions) {
   const state = (): WorkerGlobalState => globalThis.__vitest_worker__ || options.state
   const rpc = () => state().rpc
 
-  const processExit = process.exit
-
   process.exit = (code = process.exitCode || 0): never => {
-    const error = new Error(`process.exit called with "${code}"`)
-    rpc().onWorkerExit(error, code)
-    return processExit(code)
+    throw new Error(`process.exit unexpectedly called with "${code}"`)
   }
 
   function catchError(err: unknown, type: string) {

diff --git a/packages/vitest/src/runtime/vm.ts b/packages/vitest/src/runtime/vm.ts
@@ -31,7 +31,7 @@ export async function run(ctx: WorkerContext) {
       onCancel: setCancel,
     },
     {
-      eventNames: ['onUserConsoleLog', 'onFinished', 'onCollected', 'onWorkerExit'],
+      eventNames: ['onUserConsoleLog', 'onFinished', 'onCollected'],
       post(v) { port.postMessage(v) },
       on(fn) { port.addListener('message', fn) },
     },

diff --git a/packages/vitest/src/runtime/worker.ts b/packages/vitest/src/runtime/worker.ts
@@ -32,7 +32,7 @@ async function init(ctx: WorkerContext) {
       onCancel: setCancel,
     },
     {
-      eventNames: ['onUserConsoleLog', 'onFinished', 'onCollected', 'onWorkerExit', 'onCancel'],
+      eventNames: ['onUserConsoleLog', 'onFinished', 'onCollected', 'onCancel'],
       post(v) { port.postMessage(v) },
       on(fn) { port.addListener('message', fn) },
     },

diff --git a/packages/vitest/src/types/rpc.ts b/packages/vitest/src/types/rpc.ts
@@ -15,7 +15,6 @@ export interface RuntimeRPC {
   getSourceMap: (id: string, force?: boolean) => Promise<RawSourceMap | undefined>
 
   onFinished: (files: File[], errors?: unknown[]) => void
-  onWorkerExit: (error: unknown, code?: number) => void
   onPathsCollected: (paths: string[]) => void
   onUserConsoleLog: (log: UserConsoleLog) => void
   onUnhandledError: (err: unknown, type: string) => void