Fix more issues with parallel discovery and cancellation #3605
Conversation
This file contains 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
Evangelink
commented
Apr 25, 2022
| @@ -387,3 +387,4 @@ Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.Discovery | |||
| Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.TestRequestSender.SendDiscoveryAbort() -> void | |||
| Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.DiscoveredExtensions.get -> System.Collections.Generic.Dictionary<string, System.Collections.Generic.HashSet<string>> | |||
| Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel.DiscoveryCompletePayload.DiscoveredExtensions.set -> void | |||
| static Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources.AbortedTestDiscoveryWithReason.get -> string | |||
There was a problem hiding this comment.
No need to be public but I would prefer to do a follow-up PR where we would change the accessibility of all these resources (except if we expect some usage) to be internal.
| @@ -13,6 +13,11 @@ | |||
| <target state="translated">Vzdálený hostitel vynutil ukončení existujícího připojení.</target> | |||
| </trans-unit> | |||
| <trans-unit id="AbortedTestDiscovery"> | |||
| <source>The active test discovery was aborted.</source> | |||
| <note></note> | |||
| <target state="translated">Aktivní zjišťování testu se přerušilo.</target> | |||
There was a problem hiding this comment.
Added the .xlf as already translated as I am only adding a resource removing a sub sentence.
Evangelink
commented
Apr 25, 2022
| @@ -139,8 +139,14 @@ public void DiscoverTests(DiscoveryCriteria discoveryCriteria, ITestDiscoveryEve | |||
|
|
|||
| _baseTestDiscoveryEventsHandler = eventHandler; | |||
|
|
|||
| // Mark all sources as NotDiscovered before actual discovery starts | |||
| _discoveryDataAggregator.MarkSourcesWithStatus(discoverySources, DiscoveryStatus.NotDiscovered); | |||
| // Do not mark sources as not discovered, this is already done in the | |||
There was a problem hiding this comment.
Note that marking source as not discovered would change nothing so maybe I could remove my comment.
nohwnd
reviewed
Apr 26, 2022
src/Microsoft.TestPlatform.CommunicationUtilities/TestRequestSender.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyDiscoveryManager.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyDiscoveryManager.cs
Outdated
Show resolved
Hide resolved
...osoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/DiscoveryDataAggregatorTests.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyDiscoveryManager.cs
Outdated
Show resolved
Hide resolved
src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyDiscoveryManager.cs
Outdated
Show resolved
Hide resolved
Ensure source with no test is marked as fully discovered on discovery complete.
Ensure that all sources of a discovery request are marked as not discovered even if some abort was to occur before all proxy managers were instantiated.
Before this we were printing "The active test discovery was aborted. Reason: Test host process crashed" which could be confusing because this abort was expected and not due to some crash. After the change we will print only the 1st part of the message.
Co-authored-by: Jakub Jareš <me@jakubjares.com>
…arallel/DiscoveryDataAggregatorTests.cs Co-authored-by: Jakub Jareš <me@jakubjares.com>
Co-authored-by: Shyam N <shyamnamboodiripad@users.noreply.github.com>
Consider discovery as aborted if upon completion any source is not fully discovered
…lDiscoveryManager
MarcoRossignoli
approved these changes
May 9, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Fix more issues with parallel discovery and cancellation.
I suggest to review commit per commit.
Related issue
AB#1526089