fix: cancelCurrentRun awaits runningPromise (#7168)

sheremet-va · web-flow · commit 1dbf5140c1fe · 2025-01-04T11:37:42.000+01:00
diff --git a/packages/vitest/src/node/core.ts b/packages/vitest/src/node/core.ts
@@ -800,6 +800,7 @@ export class Vitest {
   async cancelCurrentRun(reason: CancelReason): Promise<void> {
     this.isCancelling = true
     await Promise.all(this._onCancelListeners.splice(0).map(listener => listener(reason)))
+    await this.runningPromise
   }
 
   /** @internal */
diff --git a/packages/vitest/src/node/stdin.ts b/packages/vitest/src/node/stdin.ts
@@ -61,7 +61,6 @@ export function registerConsoleShortcuts(
         process.exitCode = 130
 
         await ctx.cancelCurrentRun('keyboard-input')
-        await ctx.runningPromise
       }
       return ctx.exit(true)
     }

Original file line number	Diff line number	Diff line change
`@@ -800,6 +800,7 @@ export class Vitest {`
`800`	`800`	`async cancelCurrentRun(reason: CancelReason): Promise<void> {`
`801`	`801`	`this.isCancelling = true`
`802`	`802`	`await Promise.all(this._onCancelListeners.splice(0).map(listener => listener(reason)))`
	`803`	`+ await this.runningPromise`
`803`	`804`	`}`
`804`	`805`
`805`	`806`	`/** @internal */`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ export function registerConsoleShortcuts(`
`61`	`61`	`process.exitCode = 130`
`62`	`62`
`63`	`63`	`await ctx.cancelCurrentRun('keyboard-input')`
`64`		`- await ctx.runningPromise`
`65`	`64`	`}`
`66`	`65`	`return ctx.exit(true)`
`67`	`66`	`}`