Skip to content

Address Copilot review comments for assembly cleanup fix #7211

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
Evangelink merged 1 commit into from
Jan 13, 2026
+5 −4
Merged

Address Copilot review comments for assembly cleanup fix #7211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions src/Adapter/MSTestAdapter.PlatformServices/Execution/UnitTestRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,12 @@ internal async Task<TestResult[]> RunSingleTestAsync(TestMethod testMethod, IDic
testContextForClassCleanup = PlatformServiceProvider.Instance.GetTestContext(testMethod: null, testMethod.FullClassName, testContextProperties, messageLogger, testContextForTestExecution.Context.CurrentTestOutcome);

_classCleanupManager.MarkTestComplete(testMethod, out bool isLastTestInClass);
if (isLastTestInClass && testMethodInfo is not null)
if (isLastTestInClass)
{
await testMethodInfo.Parent.RunClassCleanupAsync(testContextForClassCleanup, result).ConfigureAwait(false);
if (testMethodInfo is not null)
{
await testMethodInfo.Parent.RunClassCleanupAsync(testContextForClassCleanup, result).ConfigureAwait(false);
}

// Mark the class as complete when all class cleanups are complete. When all classes are complete we progress to running assembly cleanup.
// Class is not complete until after all class cleanups are done, to prevent running assembly cleanup too early.
Expand Down
2 changes: 0 additions & 2 deletions test/IntegrationTests/MSTest.Acceptance.IntegrationTests/AssemblyCleanupTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.
[TestClass]
public class TestClass1
{
public static bool ClassCleanupFinished { get; private set; }

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