Skip to content

Handle assemblies gracefully #52308

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.

Sign up for GitHub

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
mariam-abdulla merged 5 commits into from
Jan 16, 2026
Merged

Handle assemblies gracefully #52308

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40a0f94
Handle assemblies gracefully
mariam-abdulla Jan 5, 2026
9067246
Call HandshakeFailure in case of testhost controller
mariam-abdulla Jan 15, 2026
f095831
Update src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs
mariam-abdulla Jan 15, 2026
770c8f8
Update src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs
mariam-abdulla Jan 15, 2026
6112f4a
Add check of _handshakeInfo
mariam-abdulla Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ internal sealed class TestApplicationHandler
private readonly Dictionary<string, (int TestSessionStartCount, int TestSessionEndCount)> _testSessionEventCountPerSessionUid = new();

private (string? TargetFramework, string? Architecture, string ExecutionId)? _handshakeInfo;
private bool _receivedTestHostHandshake;

public TestApplicationHandler(TerminalTestReporter output, TestModule module, TestOptions options)
{
Expand Down Expand Up @@ -62,6 +63,7 @@ internal void OnHandshakeReceived(HandshakeMessage handshakeMessage, bool gotSup
// https://github.com/microsoft/testfx/blob/2a9a353ec2bb4ce403f72e8ba1f29e01e7cf1fd4/src/Platform/Microsoft.Testing.Platform/Hosts/CommonTestHost.cs#L87-L97
if (hostType == "TestHost")
{
_receivedTestHostHandshake = true;
// AssemblyRunStarted counts "retry count", and writes to terminal "(Try <number-of-try>) Running tests from <assembly>"
// So, we want to call it only for test host, and not for test host controller (or orchestrator, if in future it will handshake as well)
// Calling it for both test host and test host controllers means we will count retries incorrectly, and will messages twice.
Expand Down Expand Up @@ -263,8 +265,10 @@ internal bool HasMismatchingTestSessionEventCount()

internal void OnTestProcessExited(int exitCode, string outputData, string errorData)
{
if (_handshakeInfo.HasValue)
if (_receivedTestHostHandshake && _handshakeInfo.HasValue)
{
// If we received a handshake from TestHostController but not from TestHost,
// call HandshakeFailure instead of AssemblyRunCompleted
_output.AssemblyRunCompleted(_handshakeInfo.Value.ExecutionId, exitCode, outputData, errorData);
}
else
Expand Down