Skip to content

Commit 31706df

Browse files
authored
fix: reuse the same environment when isolate and fileParallelism are false (#8889)
1 parent 10a06d8 commit 31706df

11 files changed

Lines changed: 34 additions & 51 deletions

File tree

‎packages/vitest/src/node/config/resolveConfig.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ export function resolveConfig(
212212
}
213213

214214
// run benchmark sequentially by default
215-
resolved.fileParallelism??=mode!=='benchmark'
215+
constfileParallelism=options.fileParallelism??mode!=='benchmark'
216216

217-
if(!resolved.fileParallelism){
217+
if(!fileParallelism){
218218
// ignore user config, parallelism cannot be implemented without limiting workers
219219
resolved.maxWorkers=1
220220
}
@@ -227,7 +227,7 @@ export function resolveConfig(
227227
}
228228

229229
if(resolved.inspect||resolved.inspectBrk){
230-
if(resolved.fileParallelism){
230+
if(resolved.maxWorkers!==1){
231231
constinspectOption=`--inspect${resolved.inspectBrk ? '-brk' : ''}`
232232
thrownewError(
233233
`You cannot use ${inspectOption} without "--no-file-parallelism"`,

‎packages/vitest/src/node/config/serializeConfig.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export function serializeConfig(project: TestProject): SerializedConfig {
1111
environmentOptions: config.environmentOptions,
1212
mode: config.mode,
1313
isolate: config.isolate,
14-
fileParallelism: config.fileParallelism,
1514
maxWorkers: config.maxWorkers,
1615
base: config.base,
1716
logHeapUsage: config.logHeapUsage,

‎packages/vitest/src/node/pool.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,14 +391,14 @@ function groupSpecs(specs: TestSpecification[], environments: Awaited<ReturnType
391391
}
392392

393393
constorder=spec.project.config.sequence.groupOrder
394+
constisolate=spec.project.config.isolate
394395

395396
// Files that have disabled parallelism and default groupOrder are set into their own group
396-
if(order===0&&spec.project.config.fileParallelism===false){
397+
if(isolate===true&&order===0&&spec.project.config.maxWorkers===1){
397398
returnsequential.specs.push([spec])
398399
}
399400

400401
constmaxWorkers=resolveMaxWorkers(spec.project)
401-
constisolate=spec.project.config.isolate
402402
groups[order]||={specs: [], maxWorkers }
403403

404404
// Multiple projects with different maxWorkers but same groupOrder

‎packages/vitest/src/node/types/config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,7 @@ export interface ResolvedConfig
984984
|'bail'
985985
|'name'
986986
|'vmMemoryLimit'
987+
|'fileParallelism'
987988
>{
988989
mode: VitestRunMode
989990

@@ -1117,7 +1118,6 @@ export type ProjectConfig = Omit<
11171118
mode?: string
11181119
sequencer?: Omit<SequenceOptions,'sequencer'|'seed'>
11191120
deps?: Omit<DepsOptions,'moduleDirectories'>
1120-
fileParallelism?: boolean
11211121
}
11221122

11231123
exporttypeResolvedProjectConfig=Omit<

‎packages/vitest/src/runtime/config.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ export interface SerializedConfig {
1515
disableConsoleIntercept: boolean|undefined
1616
runner: string|undefined
1717
isolate: boolean
18-
fileParallelism: boolean
1918
maxWorkers: number
2019
mode: 'test'|'benchmark'
2120
bail: number|undefined

‎test/config/test/failures.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,31 +70,31 @@ test('shard count can be smaller than count of test files when passWithNoTests',
7070
})
7171

7272
test('inspect requires changing pool and singleThread/singleFork',async()=>{
73-
const{ stderr }=awaitrunVitest({inspect: true})
73+
const{ stderr }=awaitrunVitest({inspect: true,maxWorkers: 4})
7474

7575
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
7676
})
7777

7878
test('inspect cannot be used with multi-threading',async()=>{
79-
const{ stderr }=awaitrunVitest({inspect: true,pool: 'threads',fileParallelism: true})
79+
const{ stderr }=awaitrunVitest({inspect: true,pool: 'threads',fileParallelism: true,maxWorkers: 4})
8080

8181
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
8282
})
8383

8484
test('inspect in browser mode requires no-file-parallelism',async()=>{
85-
const{ stderr }=awaitrunVitest({inspect: true,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
85+
const{ stderr }=awaitrunVitest({inspect: true,maxWorkers: 4,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
8686

8787
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
8888
})
8989

9090
test('inspect-brk cannot be used with multi processing',async()=>{
91-
const{ stderr }=awaitrunVitest({inspect: true,pool: 'forks',fileParallelism: true})
91+
const{ stderr }=awaitrunVitest({inspect: true,pool: 'forks',fileParallelism: true,maxWorkers: 4})
9292

9393
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
9494
})
9595

9696
test('inspect-brk in browser mode requires no-file-parallelism',async()=>{
97-
const{ stderr }=awaitrunVitest({inspectBrk: true,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
97+
const{ stderr }=awaitrunVitest({inspectBrk: true,maxWorkers: 4,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
9898

9999
expect(stderr).toMatch('Error: You cannot use --inspect-brk without "--no-file-parallelism"')
100100
})

‎test/config/test/pool.test.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ test('extended project inherits top-level pool related options', async () => {
4141
test('project level pool options overwrites top-level',async()=>{
4242
constconfig=awaitgetConfig({
4343
pool: 'vmForks',
44+
maxWorkers: 4,
4445
fileParallelism: true,
4546
projects: [{
4647
extends: true,
@@ -49,7 +50,7 @@ test('project level pool options overwrites top-level', async () => {
4950
})
5051

5152
expect(config.pool).toBe('vmThreads')
52-
expect(config.fileParallelism).toBe(false)
53+
expect(config.maxWorkers).toBe(1)
5354
})
5455

5556
test('isolated single worker pool receives single testfile at once',async()=>{
@@ -83,6 +84,24 @@ test('non-isolated single worker pool receives all testfiles at once', async ()
8384
`)
8485
})
8586

87+
test('non-isolated happy-dom worker pool receives all testfiles at once',async()=>{
88+
constfiles=awaitgetConfig<string[]>({
89+
fileParallelism: false,
90+
isolate: false,
91+
environment: 'happy-dom',
92+
sequence: {sequencer: StableTestFileOrderSorter},
93+
},{include: ['print-testfiles.test.ts','a.test.ts','b.test.ts','c.test.ts']})
94+
95+
expect(files.map(normalizeFilename)).toMatchInlineSnapshot(`
96+
[
97+
"<process-cwd>/fixtures/pool/a.test.ts",
98+
"<process-cwd>/fixtures/pool/b.test.ts",
99+
"<process-cwd>/fixtures/pool/c.test.ts",
100+
"<process-cwd>/fixtures/pool/print-testfiles.test.ts",
101+
]
102+
`)
103+
})
104+
86105
asyncfunctiongetConfig<T=SerializedConfig>(options: Partial<TestUserConfig>,cliOptions: Partial<TestUserConfig>={}): Promise<T>{
87106
letconfig: T|undefined
88107

‎test/workspaces/globalTest.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ export async function teardown() {
3636

3737
try{
3838
assert.ok(results.success)
39-
assert.equal(results.numTotalTestSuites,24)
40-
assert.equal(results.numTotalTests,29)
41-
assert.equal(results.numPassedTests,29)
39+
assert.equal(results.numTotalTestSuites,20)
40+
assert.equal(results.numTotalTests,25)
41+
assert.equal(results.numPassedTests,25)
4242
assert.ok(results.coverageMap)
4343

4444
constshared=results.testResults.filter((r: any)=>r.name.includes('space_shared/test.spec.ts'))

‎test/workspaces/space-pools/multi-worker.test.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎test/workspaces/space-pools/single-worker.test.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all \x3Cpre>\x3Ccode> blocks (function() { function addCopyButtons() { document.querySelectorAll('pre code').forEach(function(codeBlock) { if (codeBlock.parentElement.hasAttribute('data-copy-added')) return; codeBlock.parentElement.setAttribute('data-copy-added', 'true'); var btn = document.createElement('button'); btn.textContent = 'Copy'; btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;'; btn.onmouseover = function() { this.style.opacity = '1'; }; btn.onmouseout = function() { this.style.opacity = '0.7'; }; btn.onclick = function() { navigator.clipboard.writeText(codeBlock.textContent).then(function() { btn.textContent = 'Copied!'; setTimeout(function() { btn.textContent = 'Copy'; }, 1500); }); }; codeBlock.parentElement.style.position = 'relative'; codeBlock.parentElement.appendChild(btn); }); } addCopyButtons(); // Re-run on dynamic content var observer = new MutationObserver(addCopyButtons); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + ' fix: reuse the same environment when `isolate` and `fileParallelism` … · vitest-dev/vitest@31706df · GitHub
Skip to content

Commit 31706df

Browse files
authored
fix: reuse the same environment when isolate and fileParallelism are false (#8889)
1 parent 10a06d8 commit 31706df

11 files changed

Lines changed: 34 additions & 51 deletions

File tree

‎packages/vitest/src/node/config/resolveConfig.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ export function resolveConfig(
212212
}
213213

214214
// run benchmark sequentially by default
215-
resolved.fileParallelism??=mode!=='benchmark'
215+
constfileParallelism=options.fileParallelism??mode!=='benchmark'
216216

217-
if(!resolved.fileParallelism){
217+
if(!fileParallelism){
218218
// ignore user config, parallelism cannot be implemented without limiting workers
219219
resolved.maxWorkers=1
220220
}
@@ -227,7 +227,7 @@ export function resolveConfig(
227227
}
228228

229229
if(resolved.inspect||resolved.inspectBrk){
230-
if(resolved.fileParallelism){
230+
if(resolved.maxWorkers!==1){
231231
constinspectOption=`--inspect${resolved.inspectBrk ? '-brk' : ''}`
232232
thrownewError(
233233
`You cannot use ${inspectOption} without "--no-file-parallelism"`,

‎packages/vitest/src/node/config/serializeConfig.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export function serializeConfig(project: TestProject): SerializedConfig {
1111
environmentOptions: config.environmentOptions,
1212
mode: config.mode,
1313
isolate: config.isolate,
14-
fileParallelism: config.fileParallelism,
1514
maxWorkers: config.maxWorkers,
1615
base: config.base,
1716
logHeapUsage: config.logHeapUsage,

‎packages/vitest/src/node/pool.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,14 +391,14 @@ function groupSpecs(specs: TestSpecification[], environments: Awaited<ReturnType
391391
}
392392

393393
constorder=spec.project.config.sequence.groupOrder
394+
constisolate=spec.project.config.isolate
394395

395396
// Files that have disabled parallelism and default groupOrder are set into their own group
396-
if(order===0&&spec.project.config.fileParallelism===false){
397+
if(isolate===true&&order===0&&spec.project.config.maxWorkers===1){
397398
returnsequential.specs.push([spec])
398399
}
399400

400401
constmaxWorkers=resolveMaxWorkers(spec.project)
401-
constisolate=spec.project.config.isolate
402402
groups[order]||={specs: [], maxWorkers }
403403

404404
// Multiple projects with different maxWorkers but same groupOrder

‎packages/vitest/src/node/types/config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,7 @@ export interface ResolvedConfig
984984
|'bail'
985985
|'name'
986986
|'vmMemoryLimit'
987+
|'fileParallelism'
987988
>{
988989
mode: VitestRunMode
989990

@@ -1117,7 +1118,6 @@ export type ProjectConfig = Omit<
11171118
mode?: string
11181119
sequencer?: Omit<SequenceOptions,'sequencer'|'seed'>
11191120
deps?: Omit<DepsOptions,'moduleDirectories'>
1120-
fileParallelism?: boolean
11211121
}
11221122

11231123
exporttypeResolvedProjectConfig=Omit<

‎packages/vitest/src/runtime/config.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ export interface SerializedConfig {
1515
disableConsoleIntercept: boolean|undefined
1616
runner: string|undefined
1717
isolate: boolean
18-
fileParallelism: boolean
1918
maxWorkers: number
2019
mode: 'test'|'benchmark'
2120
bail: number|undefined

‎test/config/test/failures.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,31 +70,31 @@ test('shard count can be smaller than count of test files when passWithNoTests',
7070
})
7171

7272
test('inspect requires changing pool and singleThread/singleFork',async()=>{
73-
const{ stderr }=awaitrunVitest({inspect: true})
73+
const{ stderr }=awaitrunVitest({inspect: true,maxWorkers: 4})
7474

7575
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
7676
})
7777

7878
test('inspect cannot be used with multi-threading',async()=>{
79-
const{ stderr }=awaitrunVitest({inspect: true,pool: 'threads',fileParallelism: true})
79+
const{ stderr }=awaitrunVitest({inspect: true,pool: 'threads',fileParallelism: true,maxWorkers: 4})
8080

8181
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
8282
})
8383

8484
test('inspect in browser mode requires no-file-parallelism',async()=>{
85-
const{ stderr }=awaitrunVitest({inspect: true,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
85+
const{ stderr }=awaitrunVitest({inspect: true,maxWorkers: 4,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
8686

8787
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
8888
})
8989

9090
test('inspect-brk cannot be used with multi processing',async()=>{
91-
const{ stderr }=awaitrunVitest({inspect: true,pool: 'forks',fileParallelism: true})
91+
const{ stderr }=awaitrunVitest({inspect: true,pool: 'forks',fileParallelism: true,maxWorkers: 4})
9292

9393
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
9494
})
9595

9696
test('inspect-brk in browser mode requires no-file-parallelism',async()=>{
97-
const{ stderr }=awaitrunVitest({inspectBrk: true,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
97+
const{ stderr }=awaitrunVitest({inspectBrk: true,maxWorkers: 4,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
9898

9999
expect(stderr).toMatch('Error: You cannot use --inspect-brk without "--no-file-parallelism"')
100100
})

‎test/config/test/pool.test.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ test('extended project inherits top-level pool related options', async () => {
4141
test('project level pool options overwrites top-level',async()=>{
4242
constconfig=awaitgetConfig({
4343
pool: 'vmForks',
44+
maxWorkers: 4,
4445
fileParallelism: true,
4546
projects: [{
4647
extends: true,
@@ -49,7 +50,7 @@ test('project level pool options overwrites top-level', async () => {
4950
})
5051

5152
expect(config.pool).toBe('vmThreads')
52-
expect(config.fileParallelism).toBe(false)
53+
expect(config.maxWorkers).toBe(1)
5354
})
5455

5556
test('isolated single worker pool receives single testfile at once',async()=>{
@@ -83,6 +84,24 @@ test('non-isolated single worker pool receives all testfiles at once', async ()
8384
`)
8485
})
8586

87+
test('non-isolated happy-dom worker pool receives all testfiles at once',async()=>{
88+
constfiles=awaitgetConfig<string[]>({
89+
fileParallelism: false,
90+
isolate: false,
91+
environment: 'happy-dom',
92+
sequence: {sequencer: StableTestFileOrderSorter},
93+
},{include: ['print-testfiles.test.ts','a.test.ts','b.test.ts','c.test.ts']})
94+
95+
expect(files.map(normalizeFilename)).toMatchInlineSnapshot(`
96+
[
97+
"<process-cwd>/fixtures/pool/a.test.ts",
98+
"<process-cwd>/fixtures/pool/b.test.ts",
99+
"<process-cwd>/fixtures/pool/c.test.ts",
100+
"<process-cwd>/fixtures/pool/print-testfiles.test.ts",
101+
]
102+
`)
103+
})
104+
86105
asyncfunctiongetConfig<T=SerializedConfig>(options: Partial<TestUserConfig>,cliOptions: Partial<TestUserConfig>={}): Promise<T>{
87106
letconfig: T|undefined
88107

‎test/workspaces/globalTest.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ export async function teardown() {
3636

3737
try{
3838
assert.ok(results.success)
39-
assert.equal(results.numTotalTestSuites,24)
40-
assert.equal(results.numTotalTests,29)
41-
assert.equal(results.numPassedTests,29)
39+
assert.equal(results.numTotalTestSuites,20)
40+
assert.equal(results.numTotalTests,25)
41+
assert.equal(results.numPassedTests,25)
4242
assert.ok(results.coverageMap)
4343

4444
constshared=results.testResults.filter((r: any)=>r.name.includes('space_shared/test.spec.ts'))

‎test/workspaces/space-pools/multi-worker.test.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎test/workspaces/space-pools/single-worker.test.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: reuse the same environment when `isolate` and `fileParallelism` … · vitest-dev/vitest@31706df · GitHub
Skip to content

Commit 31706df

Browse files
authored
fix: reuse the same environment when isolate and fileParallelism are false (#8889)
1 parent 10a06d8 commit 31706df

11 files changed

Lines changed: 34 additions & 51 deletions

File tree

‎packages/vitest/src/node/config/resolveConfig.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ export function resolveConfig(
212212
}
213213

214214
// run benchmark sequentially by default
215-
resolved.fileParallelism??=mode!=='benchmark'
215+
constfileParallelism=options.fileParallelism??mode!=='benchmark'
216216

217-
if(!resolved.fileParallelism){
217+
if(!fileParallelism){
218218
// ignore user config, parallelism cannot be implemented without limiting workers
219219
resolved.maxWorkers=1
220220
}
@@ -227,7 +227,7 @@ export function resolveConfig(
227227
}
228228

229229
if(resolved.inspect||resolved.inspectBrk){
230-
if(resolved.fileParallelism){
230+
if(resolved.maxWorkers!==1){
231231
constinspectOption=`--inspect${resolved.inspectBrk ? '-brk' : ''}`
232232
thrownewError(
233233
`You cannot use ${inspectOption} without "--no-file-parallelism"`,

‎packages/vitest/src/node/config/serializeConfig.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export function serializeConfig(project: TestProject): SerializedConfig {
1111
environmentOptions: config.environmentOptions,
1212
mode: config.mode,
1313
isolate: config.isolate,
14-
fileParallelism: config.fileParallelism,
1514
maxWorkers: config.maxWorkers,
1615
base: config.base,
1716
logHeapUsage: config.logHeapUsage,

‎packages/vitest/src/node/pool.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,14 +391,14 @@ function groupSpecs(specs: TestSpecification[], environments: Awaited<ReturnType
391391
}
392392

393393
constorder=spec.project.config.sequence.groupOrder
394+
constisolate=spec.project.config.isolate
394395

395396
// Files that have disabled parallelism and default groupOrder are set into their own group
396-
if(order===0&&spec.project.config.fileParallelism===false){
397+
if(isolate===true&&order===0&&spec.project.config.maxWorkers===1){
397398
returnsequential.specs.push([spec])
398399
}
399400

400401
constmaxWorkers=resolveMaxWorkers(spec.project)
401-
constisolate=spec.project.config.isolate
402402
groups[order]||={specs: [], maxWorkers }
403403

404404
// Multiple projects with different maxWorkers but same groupOrder

‎packages/vitest/src/node/types/config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,7 @@ export interface ResolvedConfig
984984
|'bail'
985985
|'name'
986986
|'vmMemoryLimit'
987+
|'fileParallelism'
987988
>{
988989
mode: VitestRunMode
989990

@@ -1117,7 +1118,6 @@ export type ProjectConfig = Omit<
11171118
mode?: string
11181119
sequencer?: Omit<SequenceOptions,'sequencer'|'seed'>
11191120
deps?: Omit<DepsOptions,'moduleDirectories'>
1120-
fileParallelism?: boolean
11211121
}
11221122

11231123
exporttypeResolvedProjectConfig=Omit<

‎packages/vitest/src/runtime/config.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ export interface SerializedConfig {
1515
disableConsoleIntercept: boolean|undefined
1616
runner: string|undefined
1717
isolate: boolean
18-
fileParallelism: boolean
1918
maxWorkers: number
2019
mode: 'test'|'benchmark'
2120
bail: number|undefined

‎test/config/test/failures.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,31 +70,31 @@ test('shard count can be smaller than count of test files when passWithNoTests',
7070
})
7171

7272
test('inspect requires changing pool and singleThread/singleFork',async()=>{
73-
const{ stderr }=awaitrunVitest({inspect: true})
73+
const{ stderr }=awaitrunVitest({inspect: true,maxWorkers: 4})
7474

7575
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
7676
})
7777

7878
test('inspect cannot be used with multi-threading',async()=>{
79-
const{ stderr }=awaitrunVitest({inspect: true,pool: 'threads',fileParallelism: true})
79+
const{ stderr }=awaitrunVitest({inspect: true,pool: 'threads',fileParallelism: true,maxWorkers: 4})
8080

8181
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
8282
})
8383

8484
test('inspect in browser mode requires no-file-parallelism',async()=>{
85-
const{ stderr }=awaitrunVitest({inspect: true,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
85+
const{ stderr }=awaitrunVitest({inspect: true,maxWorkers: 4,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
8686

8787
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
8888
})
8989

9090
test('inspect-brk cannot be used with multi processing',async()=>{
91-
const{ stderr }=awaitrunVitest({inspect: true,pool: 'forks',fileParallelism: true})
91+
const{ stderr }=awaitrunVitest({inspect: true,pool: 'forks',fileParallelism: true,maxWorkers: 4})
9292

9393
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
9494
})
9595

9696
test('inspect-brk in browser mode requires no-file-parallelism',async()=>{
97-
const{ stderr }=awaitrunVitest({inspectBrk: true,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
97+
const{ stderr }=awaitrunVitest({inspectBrk: true,maxWorkers: 4,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
9898

9999
expect(stderr).toMatch('Error: You cannot use --inspect-brk without "--no-file-parallelism"')
100100
})

‎test/config/test/pool.test.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ test('extended project inherits top-level pool related options', async () => {
4141
test('project level pool options overwrites top-level',async()=>{
4242
constconfig=awaitgetConfig({
4343
pool: 'vmForks',
44+
maxWorkers: 4,
4445
fileParallelism: true,
4546
projects: [{
4647
extends: true,
@@ -49,7 +50,7 @@ test('project level pool options overwrites top-level', async () => {
4950
})
5051

5152
expect(config.pool).toBe('vmThreads')
52-
expect(config.fileParallelism).toBe(false)
53+
expect(config.maxWorkers).toBe(1)
5354
})
5455

5556
test('isolated single worker pool receives single testfile at once',async()=>{
@@ -83,6 +84,24 @@ test('non-isolated single worker pool receives all testfiles at once', async ()
8384
`)
8485
})
8586

87+
test('non-isolated happy-dom worker pool receives all testfiles at once',async()=>{
88+
constfiles=awaitgetConfig<string[]>({
89+
fileParallelism: false,
90+
isolate: false,
91+
environment: 'happy-dom',
92+
sequence: {sequencer: StableTestFileOrderSorter},
93+
},{include: ['print-testfiles.test.ts','a.test.ts','b.test.ts','c.test.ts']})
94+
95+
expect(files.map(normalizeFilename)).toMatchInlineSnapshot(`
96+
[
97+
"<process-cwd>/fixtures/pool/a.test.ts",
98+
"<process-cwd>/fixtures/pool/b.test.ts",
99+
"<process-cwd>/fixtures/pool/c.test.ts",
100+
"<process-cwd>/fixtures/pool/print-testfiles.test.ts",
101+
]
102+
`)
103+
})
104+
86105
asyncfunctiongetConfig<T=SerializedConfig>(options: Partial<TestUserConfig>,cliOptions: Partial<TestUserConfig>={}): Promise<T>{
87106
letconfig: T|undefined
88107

‎test/workspaces/globalTest.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ export async function teardown() {
3636

3737
try{
3838
assert.ok(results.success)
39-
assert.equal(results.numTotalTestSuites,24)
40-
assert.equal(results.numTotalTests,29)
41-
assert.equal(results.numPassedTests,29)
39+
assert.equal(results.numTotalTestSuites,20)
40+
assert.equal(results.numTotalTests,25)
41+
assert.equal(results.numPassedTests,25)
4242
assert.ok(results.coverageMap)
4343

4444
constshared=results.testResults.filter((r: any)=>r.name.includes('space_shared/test.spec.ts'))

‎test/workspaces/space-pools/multi-worker.test.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎test/workspaces/space-pools/single-worker.test.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: reuse the same environment when `isolate` and `fileParallelism` … · vitest-dev/vitest@31706df · GitHub
Skip to content

Commit 31706df

Browse files
authored
fix: reuse the same environment when isolate and fileParallelism are false (#8889)
1 parent 10a06d8 commit 31706df

11 files changed

Lines changed: 34 additions & 51 deletions

File tree

‎packages/vitest/src/node/config/resolveConfig.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ export function resolveConfig(
212212
}
213213

214214
// run benchmark sequentially by default
215-
resolved.fileParallelism??=mode!=='benchmark'
215+
constfileParallelism=options.fileParallelism??mode!=='benchmark'
216216

217-
if(!resolved.fileParallelism){
217+
if(!fileParallelism){
218218
// ignore user config, parallelism cannot be implemented without limiting workers
219219
resolved.maxWorkers=1
220220
}
@@ -227,7 +227,7 @@ export function resolveConfig(
227227
}
228228

229229
if(resolved.inspect||resolved.inspectBrk){
230-
if(resolved.fileParallelism){
230+
if(resolved.maxWorkers!==1){
231231
constinspectOption=`--inspect${resolved.inspectBrk ? '-brk' : ''}`
232232
thrownewError(
233233
`You cannot use ${inspectOption} without "--no-file-parallelism"`,

‎packages/vitest/src/node/config/serializeConfig.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export function serializeConfig(project: TestProject): SerializedConfig {
1111
environmentOptions: config.environmentOptions,
1212
mode: config.mode,
1313
isolate: config.isolate,
14-
fileParallelism: config.fileParallelism,
1514
maxWorkers: config.maxWorkers,
1615
base: config.base,
1716
logHeapUsage: config.logHeapUsage,

‎packages/vitest/src/node/pool.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,14 +391,14 @@ function groupSpecs(specs: TestSpecification[], environments: Awaited<ReturnType
391391
}
392392

393393
constorder=spec.project.config.sequence.groupOrder
394+
constisolate=spec.project.config.isolate
394395

395396
// Files that have disabled parallelism and default groupOrder are set into their own group
396-
if(order===0&&spec.project.config.fileParallelism===false){
397+
if(isolate===true&&order===0&&spec.project.config.maxWorkers===1){
397398
returnsequential.specs.push([spec])
398399
}
399400

400401
constmaxWorkers=resolveMaxWorkers(spec.project)
401-
constisolate=spec.project.config.isolate
402402
groups[order]||={specs: [], maxWorkers }
403403

404404
// Multiple projects with different maxWorkers but same groupOrder

‎packages/vitest/src/node/types/config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,7 @@ export interface ResolvedConfig
984984
|'bail'
985985
|'name'
986986
|'vmMemoryLimit'
987+
|'fileParallelism'
987988
>{
988989
mode: VitestRunMode
989990

@@ -1117,7 +1118,6 @@ export type ProjectConfig = Omit<
11171118
mode?: string
11181119
sequencer?: Omit<SequenceOptions,'sequencer'|'seed'>
11191120
deps?: Omit<DepsOptions,'moduleDirectories'>
1120-
fileParallelism?: boolean
11211121
}
11221122

11231123
exporttypeResolvedProjectConfig=Omit<

‎packages/vitest/src/runtime/config.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ export interface SerializedConfig {
1515
disableConsoleIntercept: boolean|undefined
1616
runner: string|undefined
1717
isolate: boolean
18-
fileParallelism: boolean
1918
maxWorkers: number
2019
mode: 'test'|'benchmark'
2120
bail: number|undefined

‎test/config/test/failures.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,31 +70,31 @@ test('shard count can be smaller than count of test files when passWithNoTests',
7070
})
7171

7272
test('inspect requires changing pool and singleThread/singleFork',async()=>{
73-
const{ stderr }=awaitrunVitest({inspect: true})
73+
const{ stderr }=awaitrunVitest({inspect: true,maxWorkers: 4})
7474

7575
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
7676
})
7777

7878
test('inspect cannot be used with multi-threading',async()=>{
79-
const{ stderr }=awaitrunVitest({inspect: true,pool: 'threads',fileParallelism: true})
79+
const{ stderr }=awaitrunVitest({inspect: true,pool: 'threads',fileParallelism: true,maxWorkers: 4})
8080

8181
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
8282
})
8383

8484
test('inspect in browser mode requires no-file-parallelism',async()=>{
85-
const{ stderr }=awaitrunVitest({inspect: true,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
85+
const{ stderr }=awaitrunVitest({inspect: true,maxWorkers: 4,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
8686

8787
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
8888
})
8989

9090
test('inspect-brk cannot be used with multi processing',async()=>{
91-
const{ stderr }=awaitrunVitest({inspect: true,pool: 'forks',fileParallelism: true})
91+
const{ stderr }=awaitrunVitest({inspect: true,pool: 'forks',fileParallelism: true,maxWorkers: 4})
9292

9393
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
9494
})
9595

9696
test('inspect-brk in browser mode requires no-file-parallelism',async()=>{
97-
const{ stderr }=awaitrunVitest({inspectBrk: true,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
97+
const{ stderr }=awaitrunVitest({inspectBrk: true,maxWorkers: 4,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
9898

9999
expect(stderr).toMatch('Error: You cannot use --inspect-brk without "--no-file-parallelism"')
100100
})

‎test/config/test/pool.test.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ test('extended project inherits top-level pool related options', async () => {
4141
test('project level pool options overwrites top-level',async()=>{
4242
constconfig=awaitgetConfig({
4343
pool: 'vmForks',
44+
maxWorkers: 4,
4445
fileParallelism: true,
4546
projects: [{
4647
extends: true,
@@ -49,7 +50,7 @@ test('project level pool options overwrites top-level', async () => {
4950
})
5051

5152
expect(config.pool).toBe('vmThreads')
52-
expect(config.fileParallelism).toBe(false)
53+
expect(config.maxWorkers).toBe(1)
5354
})
5455

5556
test('isolated single worker pool receives single testfile at once',async()=>{
@@ -83,6 +84,24 @@ test('non-isolated single worker pool receives all testfiles at once', async ()
8384
`)
8485
})
8586

87+
test('non-isolated happy-dom worker pool receives all testfiles at once',async()=>{
88+
constfiles=awaitgetConfig<string[]>({
89+
fileParallelism: false,
90+
isolate: false,
91+
environment: 'happy-dom',
92+
sequence: {sequencer: StableTestFileOrderSorter},
93+
},{include: ['print-testfiles.test.ts','a.test.ts','b.test.ts','c.test.ts']})
94+
95+
expect(files.map(normalizeFilename)).toMatchInlineSnapshot(`
96+
[
97+
"<process-cwd>/fixtures/pool/a.test.ts",
98+
"<process-cwd>/fixtures/pool/b.test.ts",
99+
"<process-cwd>/fixtures/pool/c.test.ts",
100+
"<process-cwd>/fixtures/pool/print-testfiles.test.ts",
101+
]
102+
`)
103+
})
104+
86105
asyncfunctiongetConfig<T=SerializedConfig>(options: Partial<TestUserConfig>,cliOptions: Partial<TestUserConfig>={}): Promise<T>{
87106
letconfig: T|undefined
88107

‎test/workspaces/globalTest.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ export async function teardown() {
3636

3737
try{
3838
assert.ok(results.success)
39-
assert.equal(results.numTotalTestSuites,24)
40-
assert.equal(results.numTotalTests,29)
41-
assert.equal(results.numPassedTests,29)
39+
assert.equal(results.numTotalTestSuites,20)
40+
assert.equal(results.numTotalTests,25)
41+
assert.equal(results.numPassedTests,25)
4242
assert.ok(results.coverageMap)
4343

4444
constshared=results.testResults.filter((r: any)=>r.name.includes('space_shared/test.spec.ts'))

‎test/workspaces/space-pools/multi-worker.test.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎test/workspaces/space-pools/single-worker.test.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix: reuse the same environment when `isolate` and `fileParallelism` … · vitest-dev/vitest@31706df · GitHub
Skip to content

Commit 31706df

Browse files
authored
fix: reuse the same environment when isolate and fileParallelism are false (#8889)
1 parent 10a06d8 commit 31706df

11 files changed

Lines changed: 34 additions & 51 deletions

File tree

‎packages/vitest/src/node/config/resolveConfig.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ export function resolveConfig(
212212
}
213213

214214
// run benchmark sequentially by default
215-
resolved.fileParallelism??=mode!=='benchmark'
215+
constfileParallelism=options.fileParallelism??mode!=='benchmark'
216216

217-
if(!resolved.fileParallelism){
217+
if(!fileParallelism){
218218
// ignore user config, parallelism cannot be implemented without limiting workers
219219
resolved.maxWorkers=1
220220
}
@@ -227,7 +227,7 @@ export function resolveConfig(
227227
}
228228

229229
if(resolved.inspect||resolved.inspectBrk){
230-
if(resolved.fileParallelism){
230+
if(resolved.maxWorkers!==1){
231231
constinspectOption=`--inspect${resolved.inspectBrk ? '-brk' : ''}`
232232
thrownewError(
233233
`You cannot use ${inspectOption} without "--no-file-parallelism"`,

‎packages/vitest/src/node/config/serializeConfig.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export function serializeConfig(project: TestProject): SerializedConfig {
1111
environmentOptions: config.environmentOptions,
1212
mode: config.mode,
1313
isolate: config.isolate,
14-
fileParallelism: config.fileParallelism,
1514
maxWorkers: config.maxWorkers,
1615
base: config.base,
1716
logHeapUsage: config.logHeapUsage,

‎packages/vitest/src/node/pool.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,14 +391,14 @@ function groupSpecs(specs: TestSpecification[], environments: Awaited<ReturnType
391391
}
392392

393393
constorder=spec.project.config.sequence.groupOrder
394+
constisolate=spec.project.config.isolate
394395

395396
// Files that have disabled parallelism and default groupOrder are set into their own group
396-
if(order===0&&spec.project.config.fileParallelism===false){
397+
if(isolate===true&&order===0&&spec.project.config.maxWorkers===1){
397398
returnsequential.specs.push([spec])
398399
}
399400

400401
constmaxWorkers=resolveMaxWorkers(spec.project)
401-
constisolate=spec.project.config.isolate
402402
groups[order]||={specs: [], maxWorkers }
403403

404404
// Multiple projects with different maxWorkers but same groupOrder

‎packages/vitest/src/node/types/config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,7 @@ export interface ResolvedConfig
984984
|'bail'
985985
|'name'
986986
|'vmMemoryLimit'
987+
|'fileParallelism'
987988
>{
988989
mode: VitestRunMode
989990

@@ -1117,7 +1118,6 @@ export type ProjectConfig = Omit<
11171118
mode?: string
11181119
sequencer?: Omit<SequenceOptions,'sequencer'|'seed'>
11191120
deps?: Omit<DepsOptions,'moduleDirectories'>
1120-
fileParallelism?: boolean
11211121
}
11221122

11231123
exporttypeResolvedProjectConfig=Omit<

‎packages/vitest/src/runtime/config.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ export interface SerializedConfig {
1515
disableConsoleIntercept: boolean|undefined
1616
runner: string|undefined
1717
isolate: boolean
18-
fileParallelism: boolean
1918
maxWorkers: number
2019
mode: 'test'|'benchmark'
2120
bail: number|undefined

‎test/config/test/failures.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,31 +70,31 @@ test('shard count can be smaller than count of test files when passWithNoTests',
7070
})
7171

7272
test('inspect requires changing pool and singleThread/singleFork',async()=>{
73-
const{ stderr }=awaitrunVitest({inspect: true})
73+
const{ stderr }=awaitrunVitest({inspect: true,maxWorkers: 4})
7474

7575
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
7676
})
7777

7878
test('inspect cannot be used with multi-threading',async()=>{
79-
const{ stderr }=awaitrunVitest({inspect: true,pool: 'threads',fileParallelism: true})
79+
const{ stderr }=awaitrunVitest({inspect: true,pool: 'threads',fileParallelism: true,maxWorkers: 4})
8080

8181
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
8282
})
8383

8484
test('inspect in browser mode requires no-file-parallelism',async()=>{
85-
const{ stderr }=awaitrunVitest({inspect: true,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
85+
const{ stderr }=awaitrunVitest({inspect: true,maxWorkers: 4,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
8686

8787
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
8888
})
8989

9090
test('inspect-brk cannot be used with multi processing',async()=>{
91-
const{ stderr }=awaitrunVitest({inspect: true,pool: 'forks',fileParallelism: true})
91+
const{ stderr }=awaitrunVitest({inspect: true,pool: 'forks',fileParallelism: true,maxWorkers: 4})
9292

9393
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
9494
})
9595

9696
test('inspect-brk in browser mode requires no-file-parallelism',async()=>{
97-
const{ stderr }=awaitrunVitest({inspectBrk: true,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
97+
const{ stderr }=awaitrunVitest({inspectBrk: true,maxWorkers: 4,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
9898

9999
expect(stderr).toMatch('Error: You cannot use --inspect-brk without "--no-file-parallelism"')
100100
})

‎test/config/test/pool.test.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ test('extended project inherits top-level pool related options', async () => {
4141
test('project level pool options overwrites top-level',async()=>{
4242
constconfig=awaitgetConfig({
4343
pool: 'vmForks',
44+
maxWorkers: 4,
4445
fileParallelism: true,
4546
projects: [{
4647
extends: true,
@@ -49,7 +50,7 @@ test('project level pool options overwrites top-level', async () => {
4950
})
5051

5152
expect(config.pool).toBe('vmThreads')
52-
expect(config.fileParallelism).toBe(false)
53+
expect(config.maxWorkers).toBe(1)
5354
})
5455

5556
test('isolated single worker pool receives single testfile at once',async()=>{
@@ -83,6 +84,24 @@ test('non-isolated single worker pool receives all testfiles at once', async ()
8384
`)
8485
})
8586

87+
test('non-isolated happy-dom worker pool receives all testfiles at once',async()=>{
88+
constfiles=awaitgetConfig<string[]>({
89+
fileParallelism: false,
90+
isolate: false,
91+
environment: 'happy-dom',
92+
sequence: {sequencer: StableTestFileOrderSorter},
93+
},{include: ['print-testfiles.test.ts','a.test.ts','b.test.ts','c.test.ts']})
94+
95+
expect(files.map(normalizeFilename)).toMatchInlineSnapshot(`
96+
[
97+
"<process-cwd>/fixtures/pool/a.test.ts",
98+
"<process-cwd>/fixtures/pool/b.test.ts",
99+
"<process-cwd>/fixtures/pool/c.test.ts",
100+
"<process-cwd>/fixtures/pool/print-testfiles.test.ts",
101+
]
102+
`)
103+
})
104+
86105
asyncfunctiongetConfig<T=SerializedConfig>(options: Partial<TestUserConfig>,cliOptions: Partial<TestUserConfig>={}): Promise<T>{
87106
letconfig: T|undefined
88107

‎test/workspaces/globalTest.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ export async function teardown() {
3636

3737
try{
3838
assert.ok(results.success)
39-
assert.equal(results.numTotalTestSuites,24)
40-
assert.equal(results.numTotalTests,29)
41-
assert.equal(results.numPassedTests,29)
39+
assert.equal(results.numTotalTestSuites,20)
40+
assert.equal(results.numTotalTests,25)
41+
assert.equal(results.numPassedTests,25)
4242
assert.ok(results.coverageMap)
4343

4444
constshared=results.testResults.filter((r: any)=>r.name.includes('space_shared/test.spec.ts'))

‎test/workspaces/space-pools/multi-worker.test.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎test/workspaces/space-pools/single-worker.test.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: reuse the same environment when `isolate` and `fileParallelism` … · vitest-dev/vitest@31706df · GitHub
Skip to content

Commit 31706df

Browse files
authored
fix: reuse the same environment when isolate and fileParallelism are false (#8889)
1 parent 10a06d8 commit 31706df

11 files changed

Lines changed: 34 additions & 51 deletions

File tree

‎packages/vitest/src/node/config/resolveConfig.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ export function resolveConfig(
212212
}
213213

214214
// run benchmark sequentially by default
215-
resolved.fileParallelism??=mode!=='benchmark'
215+
constfileParallelism=options.fileParallelism??mode!=='benchmark'
216216

217-
if(!resolved.fileParallelism){
217+
if(!fileParallelism){
218218
// ignore user config, parallelism cannot be implemented without limiting workers
219219
resolved.maxWorkers=1
220220
}
@@ -227,7 +227,7 @@ export function resolveConfig(
227227
}
228228

229229
if(resolved.inspect||resolved.inspectBrk){
230-
if(resolved.fileParallelism){
230+
if(resolved.maxWorkers!==1){
231231
constinspectOption=`--inspect${resolved.inspectBrk ? '-brk' : ''}`
232232
thrownewError(
233233
`You cannot use ${inspectOption} without "--no-file-parallelism"`,

‎packages/vitest/src/node/config/serializeConfig.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export function serializeConfig(project: TestProject): SerializedConfig {
1111
environmentOptions: config.environmentOptions,
1212
mode: config.mode,
1313
isolate: config.isolate,
14-
fileParallelism: config.fileParallelism,
1514
maxWorkers: config.maxWorkers,
1615
base: config.base,
1716
logHeapUsage: config.logHeapUsage,

‎packages/vitest/src/node/pool.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,14 +391,14 @@ function groupSpecs(specs: TestSpecification[], environments: Awaited<ReturnType
391391
}
392392

393393
constorder=spec.project.config.sequence.groupOrder
394+
constisolate=spec.project.config.isolate
394395

395396
// Files that have disabled parallelism and default groupOrder are set into their own group
396-
if(order===0&&spec.project.config.fileParallelism===false){
397+
if(isolate===true&&order===0&&spec.project.config.maxWorkers===1){
397398
returnsequential.specs.push([spec])
398399
}
399400

400401
constmaxWorkers=resolveMaxWorkers(spec.project)
401-
constisolate=spec.project.config.isolate
402402
groups[order]||={specs: [], maxWorkers }
403403

404404
// Multiple projects with different maxWorkers but same groupOrder

‎packages/vitest/src/node/types/config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,7 @@ export interface ResolvedConfig
984984
|'bail'
985985
|'name'
986986
|'vmMemoryLimit'
987+
|'fileParallelism'
987988
>{
988989
mode: VitestRunMode
989990

@@ -1117,7 +1118,6 @@ export type ProjectConfig = Omit<
11171118
mode?: string
11181119
sequencer?: Omit<SequenceOptions,'sequencer'|'seed'>
11191120
deps?: Omit<DepsOptions,'moduleDirectories'>
1120-
fileParallelism?: boolean
11211121
}
11221122

11231123
exporttypeResolvedProjectConfig=Omit<

‎packages/vitest/src/runtime/config.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ export interface SerializedConfig {
1515
disableConsoleIntercept: boolean|undefined
1616
runner: string|undefined
1717
isolate: boolean
18-
fileParallelism: boolean
1918
maxWorkers: number
2019
mode: 'test'|'benchmark'
2120
bail: number|undefined

‎test/config/test/failures.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,31 +70,31 @@ test('shard count can be smaller than count of test files when passWithNoTests',
7070
})
7171

7272
test('inspect requires changing pool and singleThread/singleFork',async()=>{
73-
const{ stderr }=awaitrunVitest({inspect: true})
73+
const{ stderr }=awaitrunVitest({inspect: true,maxWorkers: 4})
7474

7575
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
7676
})
7777

7878
test('inspect cannot be used with multi-threading',async()=>{
79-
const{ stderr }=awaitrunVitest({inspect: true,pool: 'threads',fileParallelism: true})
79+
const{ stderr }=awaitrunVitest({inspect: true,pool: 'threads',fileParallelism: true,maxWorkers: 4})
8080

8181
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
8282
})
8383

8484
test('inspect in browser mode requires no-file-parallelism',async()=>{
85-
const{ stderr }=awaitrunVitest({inspect: true,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
85+
const{ stderr }=awaitrunVitest({inspect: true,maxWorkers: 4,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
8686

8787
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
8888
})
8989

9090
test('inspect-brk cannot be used with multi processing',async()=>{
91-
const{ stderr }=awaitrunVitest({inspect: true,pool: 'forks',fileParallelism: true})
91+
const{ stderr }=awaitrunVitest({inspect: true,pool: 'forks',fileParallelism: true,maxWorkers: 4})
9292

9393
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
9494
})
9595

9696
test('inspect-brk in browser mode requires no-file-parallelism',async()=>{
97-
const{ stderr }=awaitrunVitest({inspectBrk: true,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
97+
const{ stderr }=awaitrunVitest({inspectBrk: true,maxWorkers: 4,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
9898

9999
expect(stderr).toMatch('Error: You cannot use --inspect-brk without "--no-file-parallelism"')
100100
})

‎test/config/test/pool.test.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ test('extended project inherits top-level pool related options', async () => {
4141
test('project level pool options overwrites top-level',async()=>{
4242
constconfig=awaitgetConfig({
4343
pool: 'vmForks',
44+
maxWorkers: 4,
4445
fileParallelism: true,
4546
projects: [{
4647
extends: true,
@@ -49,7 +50,7 @@ test('project level pool options overwrites top-level', async () => {
4950
})
5051

5152
expect(config.pool).toBe('vmThreads')
52-
expect(config.fileParallelism).toBe(false)
53+
expect(config.maxWorkers).toBe(1)
5354
})
5455

5556
test('isolated single worker pool receives single testfile at once',async()=>{
@@ -83,6 +84,24 @@ test('non-isolated single worker pool receives all testfiles at once', async ()
8384
`)
8485
})
8586

87+
test('non-isolated happy-dom worker pool receives all testfiles at once',async()=>{
88+
constfiles=awaitgetConfig<string[]>({
89+
fileParallelism: false,
90+
isolate: false,
91+
environment: 'happy-dom',
92+
sequence: {sequencer: StableTestFileOrderSorter},
93+
},{include: ['print-testfiles.test.ts','a.test.ts','b.test.ts','c.test.ts']})
94+
95+
expect(files.map(normalizeFilename)).toMatchInlineSnapshot(`
96+
[
97+
"<process-cwd>/fixtures/pool/a.test.ts",
98+
"<process-cwd>/fixtures/pool/b.test.ts",
99+
"<process-cwd>/fixtures/pool/c.test.ts",
100+
"<process-cwd>/fixtures/pool/print-testfiles.test.ts",
101+
]
102+
`)
103+
})
104+
86105
asyncfunctiongetConfig<T=SerializedConfig>(options: Partial<TestUserConfig>,cliOptions: Partial<TestUserConfig>={}): Promise<T>{
87106
letconfig: T|undefined
88107

‎test/workspaces/globalTest.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ export async function teardown() {
3636

3737
try{
3838
assert.ok(results.success)
39-
assert.equal(results.numTotalTestSuites,24)
40-
assert.equal(results.numTotalTests,29)
41-
assert.equal(results.numPassedTests,29)
39+
assert.equal(results.numTotalTestSuites,20)
40+
assert.equal(results.numTotalTests,25)
41+
assert.equal(results.numPassedTests,25)
4242
assert.ok(results.coverageMap)
4343

4444
constshared=results.testResults.filter((r: any)=>r.name.includes('space_shared/test.spec.ts'))

‎test/workspaces/space-pools/multi-worker.test.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎test/workspaces/space-pools/single-worker.test.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix: reuse the same environment when `isolate` and `fileParallelism` … · vitest-dev/vitest@31706df · GitHub
Skip to content

Commit 31706df

Browse files
authored
fix: reuse the same environment when isolate and fileParallelism are false (#8889)
1 parent 10a06d8 commit 31706df

11 files changed

Lines changed: 34 additions & 51 deletions

File tree

‎packages/vitest/src/node/config/resolveConfig.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ export function resolveConfig(
212212
}
213213

214214
// run benchmark sequentially by default
215-
resolved.fileParallelism??=mode!=='benchmark'
215+
constfileParallelism=options.fileParallelism??mode!=='benchmark'
216216

217-
if(!resolved.fileParallelism){
217+
if(!fileParallelism){
218218
// ignore user config, parallelism cannot be implemented without limiting workers
219219
resolved.maxWorkers=1
220220
}
@@ -227,7 +227,7 @@ export function resolveConfig(
227227
}
228228

229229
if(resolved.inspect||resolved.inspectBrk){
230-
if(resolved.fileParallelism){
230+
if(resolved.maxWorkers!==1){
231231
constinspectOption=`--inspect${resolved.inspectBrk ? '-brk' : ''}`
232232
thrownewError(
233233
`You cannot use ${inspectOption} without "--no-file-parallelism"`,

‎packages/vitest/src/node/config/serializeConfig.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export function serializeConfig(project: TestProject): SerializedConfig {
1111
environmentOptions: config.environmentOptions,
1212
mode: config.mode,
1313
isolate: config.isolate,
14-
fileParallelism: config.fileParallelism,
1514
maxWorkers: config.maxWorkers,
1615
base: config.base,
1716
logHeapUsage: config.logHeapUsage,

‎packages/vitest/src/node/pool.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,14 +391,14 @@ function groupSpecs(specs: TestSpecification[], environments: Awaited<ReturnType
391391
}
392392

393393
constorder=spec.project.config.sequence.groupOrder
394+
constisolate=spec.project.config.isolate
394395

395396
// Files that have disabled parallelism and default groupOrder are set into their own group
396-
if(order===0&&spec.project.config.fileParallelism===false){
397+
if(isolate===true&&order===0&&spec.project.config.maxWorkers===1){
397398
returnsequential.specs.push([spec])
398399
}
399400

400401
constmaxWorkers=resolveMaxWorkers(spec.project)
401-
constisolate=spec.project.config.isolate
402402
groups[order]||={specs: [], maxWorkers }
403403

404404
// Multiple projects with different maxWorkers but same groupOrder

‎packages/vitest/src/node/types/config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,7 @@ export interface ResolvedConfig
984984
|'bail'
985985
|'name'
986986
|'vmMemoryLimit'
987+
|'fileParallelism'
987988
>{
988989
mode: VitestRunMode
989990

@@ -1117,7 +1118,6 @@ export type ProjectConfig = Omit<
11171118
mode?: string
11181119
sequencer?: Omit<SequenceOptions,'sequencer'|'seed'>
11191120
deps?: Omit<DepsOptions,'moduleDirectories'>
1120-
fileParallelism?: boolean
11211121
}
11221122

11231123
exporttypeResolvedProjectConfig=Omit<

‎packages/vitest/src/runtime/config.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ export interface SerializedConfig {
1515
disableConsoleIntercept: boolean|undefined
1616
runner: string|undefined
1717
isolate: boolean
18-
fileParallelism: boolean
1918
maxWorkers: number
2019
mode: 'test'|'benchmark'
2120
bail: number|undefined

‎test/config/test/failures.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,31 +70,31 @@ test('shard count can be smaller than count of test files when passWithNoTests',
7070
})
7171

7272
test('inspect requires changing pool and singleThread/singleFork',async()=>{
73-
const{ stderr }=awaitrunVitest({inspect: true})
73+
const{ stderr }=awaitrunVitest({inspect: true,maxWorkers: 4})
7474

7575
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
7676
})
7777

7878
test('inspect cannot be used with multi-threading',async()=>{
79-
const{ stderr }=awaitrunVitest({inspect: true,pool: 'threads',fileParallelism: true})
79+
const{ stderr }=awaitrunVitest({inspect: true,pool: 'threads',fileParallelism: true,maxWorkers: 4})
8080

8181
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
8282
})
8383

8484
test('inspect in browser mode requires no-file-parallelism',async()=>{
85-
const{ stderr }=awaitrunVitest({inspect: true,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
85+
const{ stderr }=awaitrunVitest({inspect: true,maxWorkers: 4,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
8686

8787
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
8888
})
8989

9090
test('inspect-brk cannot be used with multi processing',async()=>{
91-
const{ stderr }=awaitrunVitest({inspect: true,pool: 'forks',fileParallelism: true})
91+
const{ stderr }=awaitrunVitest({inspect: true,pool: 'forks',fileParallelism: true,maxWorkers: 4})
9292

9393
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
9494
})
9595

9696
test('inspect-brk in browser mode requires no-file-parallelism',async()=>{
97-
const{ stderr }=awaitrunVitest({inspectBrk: true,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
97+
const{ stderr }=awaitrunVitest({inspectBrk: true,maxWorkers: 4,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
9898

9999
expect(stderr).toMatch('Error: You cannot use --inspect-brk without "--no-file-parallelism"')
100100
})

‎test/config/test/pool.test.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ test('extended project inherits top-level pool related options', async () => {
4141
test('project level pool options overwrites top-level',async()=>{
4242
constconfig=awaitgetConfig({
4343
pool: 'vmForks',
44+
maxWorkers: 4,
4445
fileParallelism: true,
4546
projects: [{
4647
extends: true,
@@ -49,7 +50,7 @@ test('project level pool options overwrites top-level', async () => {
4950
})
5051

5152
expect(config.pool).toBe('vmThreads')
52-
expect(config.fileParallelism).toBe(false)
53+
expect(config.maxWorkers).toBe(1)
5354
})
5455

5556
test('isolated single worker pool receives single testfile at once',async()=>{
@@ -83,6 +84,24 @@ test('non-isolated single worker pool receives all testfiles at once', async ()
8384
`)
8485
})
8586

87+
test('non-isolated happy-dom worker pool receives all testfiles at once',async()=>{
88+
constfiles=awaitgetConfig<string[]>({
89+
fileParallelism: false,
90+
isolate: false,
91+
environment: 'happy-dom',
92+
sequence: {sequencer: StableTestFileOrderSorter},
93+
},{include: ['print-testfiles.test.ts','a.test.ts','b.test.ts','c.test.ts']})
94+
95+
expect(files.map(normalizeFilename)).toMatchInlineSnapshot(`
96+
[
97+
"<process-cwd>/fixtures/pool/a.test.ts",
98+
"<process-cwd>/fixtures/pool/b.test.ts",
99+
"<process-cwd>/fixtures/pool/c.test.ts",
100+
"<process-cwd>/fixtures/pool/print-testfiles.test.ts",
101+
]
102+
`)
103+
})
104+
86105
asyncfunctiongetConfig<T=SerializedConfig>(options: Partial<TestUserConfig>,cliOptions: Partial<TestUserConfig>={}): Promise<T>{
87106
letconfig: T|undefined
88107

‎test/workspaces/globalTest.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ export async function teardown() {
3636

3737
try{
3838
assert.ok(results.success)
39-
assert.equal(results.numTotalTestSuites,24)
40-
assert.equal(results.numTotalTests,29)
41-
assert.equal(results.numPassedTests,29)
39+
assert.equal(results.numTotalTestSuites,20)
40+
assert.equal(results.numTotalTests,25)
41+
assert.equal(results.numPassedTests,25)
4242
assert.ok(results.coverageMap)
4343

4444
constshared=results.testResults.filter((r: any)=>r.name.includes('space_shared/test.spec.ts'))

‎test/workspaces/space-pools/multi-worker.test.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎test/workspaces/space-pools/single-worker.test.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); fix: reuse the same environment when `isolate` and `fileParallelism` … · vitest-dev/vitest@31706df · GitHub
Skip to content

Commit 31706df

Browse files
authored
fix: reuse the same environment when isolate and fileParallelism are false (#8889)
1 parent 10a06d8 commit 31706df

11 files changed

Lines changed: 34 additions & 51 deletions

File tree

‎packages/vitest/src/node/config/resolveConfig.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ export function resolveConfig(
212212
}
213213

214214
// run benchmark sequentially by default
215-
resolved.fileParallelism??=mode!=='benchmark'
215+
constfileParallelism=options.fileParallelism??mode!=='benchmark'
216216

217-
if(!resolved.fileParallelism){
217+
if(!fileParallelism){
218218
// ignore user config, parallelism cannot be implemented without limiting workers
219219
resolved.maxWorkers=1
220220
}
@@ -227,7 +227,7 @@ export function resolveConfig(
227227
}
228228

229229
if(resolved.inspect||resolved.inspectBrk){
230-
if(resolved.fileParallelism){
230+
if(resolved.maxWorkers!==1){
231231
constinspectOption=`--inspect${resolved.inspectBrk ? '-brk' : ''}`
232232
thrownewError(
233233
`You cannot use ${inspectOption} without "--no-file-parallelism"`,

‎packages/vitest/src/node/config/serializeConfig.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export function serializeConfig(project: TestProject): SerializedConfig {
1111
environmentOptions: config.environmentOptions,
1212
mode: config.mode,
1313
isolate: config.isolate,
14-
fileParallelism: config.fileParallelism,
1514
maxWorkers: config.maxWorkers,
1615
base: config.base,
1716
logHeapUsage: config.logHeapUsage,

‎packages/vitest/src/node/pool.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,14 +391,14 @@ function groupSpecs(specs: TestSpecification[], environments: Awaited<ReturnType
391391
}
392392

393393
constorder=spec.project.config.sequence.groupOrder
394+
constisolate=spec.project.config.isolate
394395

395396
// Files that have disabled parallelism and default groupOrder are set into their own group
396-
if(order===0&&spec.project.config.fileParallelism===false){
397+
if(isolate===true&&order===0&&spec.project.config.maxWorkers===1){
397398
returnsequential.specs.push([spec])
398399
}
399400

400401
constmaxWorkers=resolveMaxWorkers(spec.project)
401-
constisolate=spec.project.config.isolate
402402
groups[order]||={specs: [], maxWorkers }
403403

404404
// Multiple projects with different maxWorkers but same groupOrder

‎packages/vitest/src/node/types/config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,6 +984,7 @@ export interface ResolvedConfig
984984
|'bail'
985985
|'name'
986986
|'vmMemoryLimit'
987+
|'fileParallelism'
987988
>{
988989
mode: VitestRunMode
989990

@@ -1117,7 +1118,6 @@ export type ProjectConfig = Omit<
11171118
mode?: string
11181119
sequencer?: Omit<SequenceOptions,'sequencer'|'seed'>
11191120
deps?: Omit<DepsOptions,'moduleDirectories'>
1120-
fileParallelism?: boolean
11211121
}
11221122

11231123
exporttypeResolvedProjectConfig=Omit<

‎packages/vitest/src/runtime/config.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ export interface SerializedConfig {
1515
disableConsoleIntercept: boolean|undefined
1616
runner: string|undefined
1717
isolate: boolean
18-
fileParallelism: boolean
1918
maxWorkers: number
2019
mode: 'test'|'benchmark'
2120
bail: number|undefined

‎test/config/test/failures.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,31 +70,31 @@ test('shard count can be smaller than count of test files when passWithNoTests',
7070
})
7171

7272
test('inspect requires changing pool and singleThread/singleFork',async()=>{
73-
const{ stderr }=awaitrunVitest({inspect: true})
73+
const{ stderr }=awaitrunVitest({inspect: true,maxWorkers: 4})
7474

7575
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
7676
})
7777

7878
test('inspect cannot be used with multi-threading',async()=>{
79-
const{ stderr }=awaitrunVitest({inspect: true,pool: 'threads',fileParallelism: true})
79+
const{ stderr }=awaitrunVitest({inspect: true,pool: 'threads',fileParallelism: true,maxWorkers: 4})
8080

8181
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
8282
})
8383

8484
test('inspect in browser mode requires no-file-parallelism',async()=>{
85-
const{ stderr }=awaitrunVitest({inspect: true,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
85+
const{ stderr }=awaitrunVitest({inspect: true,maxWorkers: 4,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
8686

8787
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
8888
})
8989

9090
test('inspect-brk cannot be used with multi processing',async()=>{
91-
const{ stderr }=awaitrunVitest({inspect: true,pool: 'forks',fileParallelism: true})
91+
const{ stderr }=awaitrunVitest({inspect: true,pool: 'forks',fileParallelism: true,maxWorkers: 4})
9292

9393
expect(stderr).toMatch('Error: You cannot use --inspect without "--no-file-parallelism"')
9494
})
9595

9696
test('inspect-brk in browser mode requires no-file-parallelism',async()=>{
97-
const{ stderr }=awaitrunVitest({inspectBrk: true,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
97+
const{ stderr }=awaitrunVitest({inspectBrk: true,maxWorkers: 4,browser: {enabled: true,instances: [{browser: 'chromium'}],provider: playwright()}})
9898

9999
expect(stderr).toMatch('Error: You cannot use --inspect-brk without "--no-file-parallelism"')
100100
})

‎test/config/test/pool.test.ts‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ test('extended project inherits top-level pool related options', async () => {
4141
test('project level pool options overwrites top-level',async()=>{
4242
constconfig=awaitgetConfig({
4343
pool: 'vmForks',
44+
maxWorkers: 4,
4445
fileParallelism: true,
4546
projects: [{
4647
extends: true,
@@ -49,7 +50,7 @@ test('project level pool options overwrites top-level', async () => {
4950
})
5051

5152
expect(config.pool).toBe('vmThreads')
52-
expect(config.fileParallelism).toBe(false)
53+
expect(config.maxWorkers).toBe(1)
5354
})
5455

5556
test('isolated single worker pool receives single testfile at once',async()=>{
@@ -83,6 +84,24 @@ test('non-isolated single worker pool receives all testfiles at once', async ()
8384
`)
8485
})
8586

87+
test('non-isolated happy-dom worker pool receives all testfiles at once',async()=>{
88+
constfiles=awaitgetConfig<string[]>({
89+
fileParallelism: false,
90+
isolate: false,
91+
environment: 'happy-dom',
92+
sequence: {sequencer: StableTestFileOrderSorter},
93+
},{include: ['print-testfiles.test.ts','a.test.ts','b.test.ts','c.test.ts']})
94+
95+
expect(files.map(normalizeFilename)).toMatchInlineSnapshot(`
96+
[
97+
"<process-cwd>/fixtures/pool/a.test.ts",
98+
"<process-cwd>/fixtures/pool/b.test.ts",
99+
"<process-cwd>/fixtures/pool/c.test.ts",
100+
"<process-cwd>/fixtures/pool/print-testfiles.test.ts",
101+
]
102+
`)
103+
})
104+
86105
asyncfunctiongetConfig<T=SerializedConfig>(options: Partial<TestUserConfig>,cliOptions: Partial<TestUserConfig>={}): Promise<T>{
87106
letconfig: T|undefined
88107

‎test/workspaces/globalTest.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ export async function teardown() {
3636

3737
try{
3838
assert.ok(results.success)
39-
assert.equal(results.numTotalTestSuites,24)
40-
assert.equal(results.numTotalTests,29)
41-
assert.equal(results.numPassedTests,29)
39+
assert.equal(results.numTotalTestSuites,20)
40+
assert.equal(results.numTotalTests,25)
41+
assert.equal(results.numPassedTests,25)
4242
assert.ok(results.coverageMap)
4343

4444
constshared=results.testResults.filter((r: any)=>r.name.includes('space_shared/test.spec.ts'))

‎test/workspaces/space-pools/multi-worker.test.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎test/workspaces/space-pools/single-worker.test.ts‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)