Improve ExecutionContext propagation#5156
Merged
Merged
Conversation
Member
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
nohwnd
reviewed
Mar 6, 2025
Member
nohwnd
left a comment
nohwnd
left a comment
There was a problem hiding this comment.
seeing minimal changes in tests, is the change of how tests are isolated not happening in this PR, or we don't test it?
Member
Author
There were some existing tests which I extended a bit. |
nohwnd
reviewed
Mar 6, 2025
nohwnd
approved these changes
Mar 6, 2025
Member
Author
|
/backport to rel/3.8 |
Contributor
|
Started backporting to rel/3.8: https://github.com/microsoft/testfx/actions/runs/13882857949 |
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Improve ExecutionContext propagation
Using index info to reconstruct a base tree...
M src/Adapter/MSTest.TestAdapter/Execution/TestClassInfo.cs
M src/Adapter/MSTest.TestAdapter/Execution/TestMethodInfo.cs
M src/Adapter/MSTest.TestAdapter/Execution/UnitTestRunner.cs
Falling back to patching base and 3-way merge...
Removing src/Adapter/MSTestAdapter.PlatformServices/Services/InstanceExecutionContextScope.cs
Removing src/Adapter/MSTestAdapter.PlatformServices/Services/IExecutionContextScope.cs
Removing src/Adapter/MSTestAdapter.PlatformServices/Services/ExecutionContextService.cs
Removing src/Adapter/MSTestAdapter.PlatformServices/Services/ClassExecutionContextScope.cs
Removing src/Adapter/MSTestAdapter.PlatformServices/Services/AssemblyExecutionContextScope.cs
Auto-merging src/Adapter/MSTest.TestAdapter/Execution/UnitTestRunner.cs
Auto-merging src/Adapter/MSTest.TestAdapter/Execution/TestMethodInfo.cs
CONFLICT (content): Merge conflict in src/Adapter/MSTest.TestAdapter/Execution/TestMethodInfo.cs
Auto-merging src/Adapter/MSTest.TestAdapter/Execution/TestClassInfo.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Improve ExecutionContext propagation
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --continue
Applying: Improve ExecutionContext propagation
Applying: Fix tests
Applying: Fix for class cleanups
Applying: Adjust
Applying: Adjust for netfx
Applying: Adjust
Applying: Delete wrong comment
Applying: Remove misleading comment
Applying: Enhance tests
Applying: Fix test
Applying: More test fixes
Applying: Fix tests
Applying: Delete unintentionally committed code
Applying: Create LogMessageListener on the correct execution context
error: sha1 information is lacking or useless (src/Adapter/MSTest.TestAdapter/Execution/TestClassInfo.cs).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0014 Create LogMessageListener on the correct execution context
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --continue
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: Create LogMessageListener on the correct execution context
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
16 similar comments
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --continue
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: Create LogMessageListener on the correct execution context
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --continue
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: Create LogMessageListener on the correct execution context
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --continue
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: Create LogMessageListener on the correct execution context
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --continue
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: Create LogMessageListener on the correct execution context
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --continue
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: Create LogMessageListener on the correct execution context
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --continue
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: Create LogMessageListener on the correct execution context
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --continue
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: Create LogMessageListener on the correct execution context
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --continue
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: Create LogMessageListener on the correct execution context
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --continue
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: Create LogMessageListener on the correct execution context
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --continue
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: Create LogMessageListener on the correct execution context
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --continue
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: Create LogMessageListener on the correct execution context
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --continue
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: Create LogMessageListener on the correct execution context
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --continue
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: Create LogMessageListener on the correct execution context
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --continue
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: Create LogMessageListener on the correct execution context
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --continue
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: Create LogMessageListener on the correct execution context
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
@Youssef1313 backporting to rel/3.8 failed, the patch most likely resulted in conflicts: $ git am --continue
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: Create LogMessageListener on the correct execution context
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
Error: The process '/usr/bin/git' failed with exit code 128NOTE: A PR will be created, but needs to be revised manually! |
Contributor
|
Potential infinite loop guard hit. Stopping |
stan-sz
pushed a commit
to stan-sz/testfx
that referenced
this pull request
Apr 1, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #5154
Fixes #4132
Original behavior on 3.6.x (before introduction of RetryAttribute and making RunSingleTest being async)
When not enabling parallelization
We execute tests in a loop, and at any step, async local changes are visible to all subsequent steps. (assuming no Timeout is involved, because that was previously a very different story).
By "step", I mean assembly initialize, class initialize, ctor, test initialize, test method, test cleanup, Dispose, and DisposeAsync.
When enabling parallelization
We create N worker threads, each is dequeuing test cases from a common concurrent queue, and then running them.
All tests in each thread are run on a similar fashion as the "non-parallelizing" case. But when parallelization is enabled, a change to an async local at any step, won't be visible from the other thread. That means, a change to an async local in assembly initialize won't be visible to all tests. It will be visible to tests that run on the same worker thread though.
New behavior from this PR
We have three levels. First is assembly, second is class, third is test.
We propagate from the highest level down, but not the other way around.
That means, a change of an async local in AssemblyInitialize is visible to all ClassInitialize methods regardless of which thread they are on. Similarly, a change in ClassInitialize is visible to all test methods (including initialize and cleanup). Also, a change from test initialize is visible to the test method itself, etc.
However, A change of an async local in a TestCleanup is NEVER seen in ClassCleanup. That's what I mean by propagating from highest level down, and not the other way around. This creates reasonable isolation.
This works as follows:
ℹ️ The test methods are duplicated, because the first method will already have the correct context. So it would not fail. The second method will restore the context, and if we don't restore it correctly we will fail.