Fix timeout handling in DcpHostNotificationTests to prevent test hangs (#12152)

* Initial plan

* Fix timeout handling in DcpHostNotificationTests to prevent test hangs

Co-authored-by: davidfowl <[email protected]>

* Keep CancellationTokenSource and add DefaultTimeout to ReadAsync operations

Co-authored-by: davidfowl <[email protected]>

* Move DefaultTimeout to EnsureDcpContainerRuntimeAsync and other task-returning calls

Co-authored-by: davidfowl <[email protected]>

* Update tests/Aspire.Hosting.Tests/Dcp/DcpHostNotificationTests.cs

* Update tests/Aspire.Hosting.Tests/Dcp/DcpHostNotificationTests.cs

Co-authored-by: Copilot <[email protected]>

* Update tests/Aspire.Hosting.Tests/Dcp/DcpHostNotificationTests.cs

* Update tests/Aspire.Hosting.Tests/Dcp/DcpHostNotificationTests.cs

---------

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: davidfowl <[email protected]>
Co-authored-by: David Fowler <[email protected]>
Co-authored-by: Copilot <[email protected]>

Author: 3 people

tests/Aspire.Hosting.Tests/Dcp/DcpHostNotificationTests.cs

@@ -4,6 +4,7 @@
 using System.Globalization;
 using Aspire.Hosting.Dcp;
 using Aspire.Hosting.Resources;
+using Microsoft.AspNetCore.InternalTesting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
@@ -76,7 +77,7 @@ public async Task DcpHost_WithUnhealthyContainerRuntime_ShowsNotification()
             timeProvider);
 
         // Act
-        await dcpHost.EnsureDcpContainerRuntimeAsync(CancellationToken.None);
+        await dcpHost.EnsureDcpContainerRuntimeAsync(CancellationToken.None).DefaultTimeout();
 
         using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
         var interaction = await interactionService.Interactions.Reader.ReadAsync(cts.Token);
@@ -125,7 +126,7 @@ public async Task DcpHost_WithHealthyContainerRuntime_DoesNotShowNotification()
             timeProvider);
 
         // Act
-        await dcpHost.EnsureDcpContainerRuntimeAsync(CancellationToken.None);
+        await dcpHost.EnsureDcpContainerRuntimeAsync(CancellationToken.None).DefaultTimeout();
 
         // Use a short timeout to check that no notification is sent
         using var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(100));
@@ -180,7 +181,7 @@ public async Task DcpHost_WithDashboardDisabled_DoesNotShowNotification()
             timeProvider);
 
         // Act
-        await dcpHost.EnsureDcpContainerRuntimeAsync(CancellationToken.None);
+        await dcpHost.EnsureDcpContainerRuntimeAsync(CancellationToken.None).DefaultTimeout();
 
         // Use a short timeout to check that no notification is sent
         using var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(100));
@@ -235,7 +236,7 @@ public async Task DcpHost_WithPodmanUnhealthy_ShowsCorrectMessage()
             timeProvider);
 
         // Act
-        await dcpHost.EnsureDcpContainerRuntimeAsync(CancellationToken.None);
+        await dcpHost.EnsureDcpContainerRuntimeAsync(CancellationToken.None).DefaultTimeout();
 
         using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
         var interaction = await interactionService.Interactions.Reader.ReadAsync(cts.Token);
@@ -285,7 +286,7 @@ public async Task DcpHost_WithUnhealthyContainerRuntime_NotificationCancelledWhe
             timeProvider);
 
         // Act
-        await dcpHost.EnsureDcpContainerRuntimeAsync(CancellationToken.None);
+        await dcpHost.EnsureDcpContainerRuntimeAsync(CancellationToken.None).DefaultTimeout();
 
         // Use ReadAsync with timeout to wait for the notification
         using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
@@ -310,7 +311,11 @@ public async Task DcpHost_WithUnhealthyContainerRuntime_NotificationCancelledWhe
         timeProvider.Advance(TimeSpan.FromSeconds(5));
 
         // Assert - The notification should now be cancelled
-        await Assert.ThrowsAsync<TaskCanceledException>(() => Task.Delay(-1, interaction.CancellationToken));
+        using (var testTimeoutCts = new CancellationTokenSource(TimeSpan.FromSeconds(5)))
+        using (var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(interaction.CancellationToken, testTimeoutCts.Token))
+        {
+            await Assert.ThrowsAsync<TaskCanceledException>(() => Task.Delay(-1, linkedCts.Token));
+        }
     }
 
     [Fact]
@@ -349,7 +354,7 @@ public async Task DcpHost_WithContainerRuntimeNotInstalled_ShowsNotificationWith
             timeProvider);
 
         // Act
-        await dcpHost.EnsureDcpContainerRuntimeAsync(CancellationToken.None);
+        await dcpHost.EnsureDcpContainerRuntimeAsync(CancellationToken.None).DefaultTimeout();
 
         using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
         var interaction = await interactionService.Interactions.Reader.ReadAsync(cts.Token);