-
Notifications
You must be signed in to change notification settings - Fork 351
[test optimization] Support pool:"threads" in vitest
#6809
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+170
−116
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -60,6 +60,7 @@ let testManagementAttemptToFixRetries = 0 | |
| let isDiEnabled = false | ||
| let testCodeCoverageLinesTotal | ||
| let isSessionStarted = false | ||
| let vitestPool = null | ||
|
|
||
| const BREAKPOINT_HIT_GRACE_PERIOD_MS = 400 | ||
|
|
||
|
|
@@ -389,6 +390,7 @@ function getFinishWrapper (exitOrClose) { | |
| isEarlyFlakeDetectionEnabled, | ||
| isEarlyFlakeDetectionFaulty, | ||
| isTestManagementTestsEnabled, | ||
| vitestPool, | ||
| onFinish | ||
| }) | ||
|
|
||
|
|
@@ -418,11 +420,27 @@ function getCreateCliWrapper (vitestPackage, frameworkVersion) { | |
| } | ||
|
|
||
| function threadHandler (thread) { | ||
| if (workerProcesses.has(thread.process)) { | ||
| const { runtime } = thread | ||
| let workerProcess | ||
| if (runtime === 'child_process') { | ||
| vitestPool = 'child_process' | ||
| workerProcess = thread.process | ||
| } else if (runtime === 'worker_threads') { | ||
| vitestPool = 'worker_threads' | ||
| workerProcess = thread.thread | ||
| } else { | ||
| vitestPool = 'unknown' | ||
| } | ||
| if (!workerProcess) { | ||
| log.error('Vitest error: could not get process or thread from TinyPool#run') | ||
| return | ||
| } | ||
|
|
||
| if (workerProcesses.has(workerProcess)) { | ||
| return | ||
| } | ||
| workerProcesses.add(thread.process) | ||
| thread.process.on('message', (message) => { | ||
| workerProcesses.add(workerProcess) | ||
| workerProcess.on('message', (message) => { | ||
| if (message.__tinypool_worker_message__ && message.data) { | ||
| if (message.interprocessCode === VITEST_WORKER_TRACE_PAYLOAD_CODE) { | ||
| workerReportTraceCh.publish(message.data) | ||
|
|
@@ -433,18 +451,32 @@ function threadHandler (thread) { | |
| }) | ||
| } | ||
|
|
||
| addHook({ | ||
| name: 'tinypool', | ||
| versions: ['>=1.0.0'], | ||
| file: 'dist/index.js' | ||
| }, (TinyPool) => { | ||
| function wrapTinyPoolRun (TinyPool) { | ||
| shimmer.wrap(TinyPool.prototype, 'run', run => async function () { | ||
| // We have to do this before and after because the threads list gets recycled, that is, the processes are re-created | ||
| this.threads.forEach(threadHandler) | ||
| const runResult = await run.apply(this, arguments) | ||
| this.threads.forEach(threadHandler) | ||
| return runResult | ||
| }) | ||
| } | ||
|
|
||
| addHook({ | ||
| name: 'tinypool', | ||
| // version from [email protected] was used in [email protected] | ||
| versions: ['>=0.8.0 <1.0.0'], | ||
| file: 'dist/esm/index.js' | ||
| }, (TinyPool) => { | ||
| wrapTinyPoolRun(TinyPool) | ||
| return TinyPool | ||
| }) | ||
|
|
||
| addHook({ | ||
| name: 'tinypool', | ||
| versions: ['>=1.0.0'], | ||
| file: 'dist/index.js' | ||
| }, (TinyPool) => { | ||
| wrapTinyPoolRun(TinyPool) | ||
|
|
||
| return TinyPool | ||
| }) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the test almost did not change, I just added the
content.meta[VITEST_POOL]assertions. It looks changed because two pool configs are run now