Skip to content

Fix double disposal of ITestHostApplicationLifetime implementing IAsyncCleanableExtension #6805

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

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Fix double disposal of ITestHostApplicationLifetime implementing IAsyncCleanableExtension #6805

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f1fc896
Initial plan
Copilot Oct 26, 2025
ec2e2d4
Fix double call to CleanupAsync for ITestHostApplicationLifetime exte…
Copilot Oct 26, 2025
01e63de
Fix dataConsumer not being added to alreadyDisposed list
Copilot Oct 26, 2025
2253eaf
Add unit tests for DisposeHelper to prevent regression of double Clea…
Copilot Oct 26, 2025
d69a4d8
Add using AwesomeAssertions to DisposeHelperTests
Copilot Oct 27, 2025
9432cb4
Use MSTest assertions instead of AwesomeAssertions
Copilot Oct 27, 2025
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
8 changes: 5 additions & 3 deletions src/Platform/Microsoft.Testing.Platform/Hosts/CommonTestHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ namespace Microsoft.Testing.Platform.Hosts;
/// </summary>
internal abstract class CommonHost(ServiceProvider serviceProvider) : IHost
{
private readonly List<object> _alreadyDisposedServices = [];

public ServiceProvider ServiceProvider => serviceProvider;

protected IPushOnlyProtocol? PushOnlyProtocol => ServiceProvider.GetService<IPushOnlyProtocol>();
Expand Down Expand Up @@ -69,7 +71,7 @@ public async Task<int> RunAsync()
}
finally
{
await DisposeServiceProviderAsync(ServiceProvider, isProcessShutdown: true).ConfigureAwait(false);
await DisposeServiceProviderAsync(ServiceProvider, alreadyDisposed: _alreadyDisposedServices, isProcessShutdown: true).ConfigureAwait(false);
await DisposeHelper.DisposeAsync(ServiceProvider.GetService<FileLoggerProvider>()).ConfigureAwait(false);
await DisposeHelper.DisposeAsync(PushOnlyProtocol).ConfigureAwait(false);

Expand Down Expand Up @@ -121,6 +123,7 @@ private async Task<int> RunTestAppAsync(CancellationToken testApplicationCancell
{
await testApplicationLifecycleCallbacks.AfterRunAsync(exitCode, testApplicationCancellationToken).ConfigureAwait(false);
await DisposeHelper.DisposeAsync(testApplicationLifecycleCallbacks).ConfigureAwait(false);
_alreadyDisposedServices.Add(testApplicationLifecycleCallbacks);
}
#pragma warning restore CS0618 // Type or member is obsolete
}
Expand Down Expand Up @@ -243,7 +246,6 @@ protected static async Task DisposeServiceProviderAsync(ServiceProvider serviceP
#pragma warning disable CS0618 // Type or member is obsolete
if (!isProcessShutdown &&
service is ITelemetryCollector or
ITestHostApplicationLifetime or
ITestHostApplicationLifetime or
IPushOnlyProtocol)
{
Expand All @@ -269,7 +271,7 @@ ITestHostApplicationLifetime or
if (!alreadyDisposed.Contains(dataConsumer))
{
await DisposeHelper.DisposeAsync(dataConsumer).ConfigureAwait(false);
alreadyDisposed.Add(service);
alreadyDisposed.Add(dataConsumer);
}
}
}
Expand Down
Loading