Skip to content

[fix] Preserve the real exception (type + stack trace) when a test run aborts in BaseRunTests #16167

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
Jakub Jareš (nohwnd) merged 2 commits into from
Jun 27, 2026
+76 −1
Merged

[fix] Preserve the real exception (type + stack trace) when a test run aborts in BaseRunTests #16167

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
374097c
Fix exception wrapping bug in BaseRunTests.RunTests
nohwnd Jun 25, 2026
c249f42
Unwrap TargetInvocationException to the real exception on run abort
nohwnd Jun 26, 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
2 changes: 1 addition & 1 deletion src/Microsoft.TestPlatform.CrossPlatEngine/Execution/BaseRunTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ public void RunTests()
{
EqtTrace.Error("BaseRunTests.RunTests: Failed to run the tests. Reason: {0}.", ex);

exception = new Exception(ex.Message, ex.InnerException);
Comment thread
nohwnd marked this conversation as resolved.
exception = new Exception(ex.Message, ex);
isAborted = true;
}
finally
Expand Down
31 changes: 31 additions & 0 deletions test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/BaseRunTestsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,37 @@ public void RunTestsShouldRaiseTestRunCompleteWithAbortedAsTrueOnException()
Assert.IsTrue(receivedCompleteArgs.IsAborted);
}

[TestMethod]
public void RunTestsShouldPreserveOriginalExceptionAsInnerException()
{
TestRunCompleteEventArgs? receivedCompleteArgs = null;
var originalException = new NotImplementedException("original message");

// Setup mocks.
_runTestsInstance.GetExecutorUriExtensionMapCallback = (fh, rc) => throw originalException;
_mockTestRunEventsHandler.Setup(
treh =>
treh.HandleTestRunComplete(
It.IsAny<TestRunCompleteEventArgs>(),
It.IsAny<TestRunChangedEventArgs>(),
It.IsAny<ICollection<AttachmentSet>>(),
It.IsAny<ICollection<string>>()))
.Callback(
(
TestRunCompleteEventArgs complete,
TestRunChangedEventArgs stats,
ICollection<AttachmentSet> attachments,
ICollection<string> executorUris) => receivedCompleteArgs = complete);

_runTestsInstance.RunTests();

Assert.IsNotNull(receivedCompleteArgs);
Assert.IsTrue(receivedCompleteArgs.IsAborted);
Assert.IsNotNull(receivedCompleteArgs.Error);
Assert.AreSame(originalException, receivedCompleteArgs.Error!.InnerException,
"The original exception should be preserved as the inner exception of the wrapper.");
}

[TestMethod]
public void RunTestsShouldNotThrowIfExceptionIsAFileNotFoundException()
{
Expand Down
Loading