fix(vm-threads): tests not cancelled on key press, cancelled tests sh…

…own twice (#4781)
vitest-dev · Dec 28, 2023 · cf53d4b · cf53d4b
1 parent 20570d1
commit cf53d4b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/packages/vitest/src/node/pools/browser.ts b/packages/vitest/src/node/pools/browser.ts
@@ -44,7 +44,7 @@ export function createBrowserPool(ctx: Vitest): ProcessPool {
  if (project.config.browser.isolate) {
  for (const path of paths) {
  if (isCancelled) {
- ctx.state.cancelFiles(files.slice(paths.indexOf(path)), ctx.config.root, project.getName())
+ ctx.state.cancelFiles(files.slice(paths.indexOf(path)), ctx.config.root, project.config.name)
  break
  }
 

diff --git a/packages/vitest/src/node/pools/child.ts b/packages/vitest/src/node/pools/child.ts
@@ -118,7 +118,7 @@ export function createChildProcessPool(ctx: Vitest, { execArgv, env, forksPath }
 
  // Intentionally cancelled
  else if (ctx.isCancelling && error instanceof Error && /The task has been cancelled/.test(error.message))
- ctx.state.cancelFiles(files, ctx.config.root, project.getName())
+ ctx.state.cancelFiles(files, ctx.config.root, project.config.name)
 
  else
  throw error

diff --git a/packages/vitest/src/node/pools/threads.ts b/packages/vitest/src/node/pools/threads.ts
@@ -106,7 +106,7 @@ export function createThreadsPool(ctx: Vitest, { execArgv, env, workerPath }: Po
 
  // Intentionally cancelled
  else if (ctx.isCancelling && error instanceof Error && /The task has been cancelled/.test(error.message))
- ctx.state.cancelFiles(files, ctx.config.root, project.getName())
+ ctx.state.cancelFiles(files, ctx.config.root, project.config.name)
 
  else
  throw error

diff --git a/packages/vitest/src/node/pools/vm-threads.ts b/packages/vitest/src/node/pools/vm-threads.ts
@@ -111,7 +111,7 @@ export function createVmThreadsPool(ctx: Vitest, { execArgv, env, vmPath }: Pool
 
  // Intentionally cancelled
  else if (ctx.isCancelling && error instanceof Error && /The task has been cancelled/.test(error.message))
- ctx.state.cancelFiles(files, ctx.config.root, project.getName())
+ ctx.state.cancelFiles(files, ctx.config.root, project.config.name)
 
  else
  throw error
@@ -123,6 +123,9 @@ export function createVmThreadsPool(ctx: Vitest, { execArgv, env, vmPath }: Pool
  }
 
  return async (specs, invalidates) => {
+ // Cancel pending tasks from pool when possible
+ ctx.onCancel(() => pool.cancelPendingTasks())
+
  const configs = new Map<WorkspaceProject, ResolvedConfig>()
  const getConfig = (project: WorkspaceProject): ResolvedConfig => {
  if (configs.has(project))