Reenable WithDockerfile live tests.

Reenable WithDockerfile live tests.

Author: mitchdenny

tests/Aspire.Hosting.Containers.Tests/WithDockerfileTests.cs

@@ -9,19 +9,15 @@
 using Aspire.Hosting.Utils;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Polly;
-using Polly.Timeout;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace Aspire.Hosting.Containers.Tests;
 
 public class WithDockerfileTests(ITestOutputHelper testOutputHelper)
 {
-    // Currently we can only run this locally because the CI agents don't have buildkit support enabled.
     [Fact]
     [RequiresDocker]
-    [ActiveIssue("https://github.com/dotnet/aspire/issues/4613")]
     public async Task WithBuildSecretPopulatesSecretFilesCorrectly()
     {
         using var builder = TestDistributedApplicationBuilder.Create();
@@ -44,20 +40,21 @@ public async Task WithBuildSecretPopulatesSecretFilesCorrectly()
         using var app = builder.Build();
         await app.StartAsync();
 
+        await WaitForResourceAsync(app, "testcontainer", "Running");
+
         using var client = app.CreateHttpClient("testcontainer", "http");
 
-        var envSecretMessage = await client.GetStringWithRetryAsync("/ENV_SECRET.txt");
+        var envSecretMessage = await client.GetStringAsync("/ENV_SECRET.txt");
         Assert.Equal("open sesame from env", envSecretMessage);
 
-        var fileSecretMessage = await client.GetStringWithRetryAsync("/FILE_SECRET.txt");
+        var fileSecretMessage = await client.GetStringAsync("/FILE_SECRET.txt");
         Assert.Equal("open sesame from file", fileSecretMessage);
 
         await app.StopAsync();
     }
 
     [Fact]
     [RequiresDocker]
-    [ActiveIssue("https://github.com/dotnet/aspire/issues/4613")]
     public async Task WithDockerfileLaunchesContainerSuccessfully()
     {
         using var builder = TestDistributedApplicationBuilder.Create();
@@ -72,9 +69,11 @@ public async Task WithDockerfileLaunchesContainerSuccessfully()
         using var app = builder.Build();
         await app.StartAsync();
 
+        await WaitForResourceAsync(app, "testcontainer", "Running");
+
         using var client = app.CreateHttpClient("testcontainer", "http");
 
-        var message = await client.GetStringWithRetryAsync("/aspire.html"); // Proves the container built, ran, and contains customizations!
+        var message = await client.GetStringAsync("/aspire.html");
 
         Assert.Equal($"{DefaultMessage}\n", message);
 
@@ -90,7 +89,6 @@ public async Task WithDockerfileLaunchesContainerSuccessfully()
 
     [Fact]
     [RequiresDocker]
-    [ActiveIssue("https://github.com/dotnet/aspire/issues/4613")]
     public async Task AddDockerfileLaunchesContainerSuccessfully()
     {
         using var builder = TestDistributedApplicationBuilder.Create();
@@ -104,9 +102,10 @@ public async Task AddDockerfileLaunchesContainerSuccessfully()
         using var app = builder.Build();
         await app.StartAsync();
 
-        using var client = app.CreateHttpClient("testcontainer", "http");
+        await WaitForResourceAsync(app, "testcontainer", "Running");
 
-        var message = await client.GetStringWithRetryAsync("/aspire.html"); // Proves the container built, ran, and contains customizations!
+        using var client = app.CreateHttpClient("testcontainer", "http");
+        var message = await client.GetStringAsync("/aspire.html");
 
         Assert.Equal($"{DefaultMessage}\n", message);
 
@@ -401,7 +400,6 @@ public async Task AddDockerfileWithBuildSecretFilePathResultsInManifestReferenci
 
     [Fact]
     [RequiresDocker]
-    [ActiveIssue("https://github.com/dotnet/aspire/issues/4613")]
     public async Task WithDockerfileWithParameterLaunchesContainerSuccessfully()
     {
         using var builder = TestDistributedApplicationBuilder.Create();
@@ -424,9 +422,11 @@ public async Task WithDockerfileWithParameterLaunchesContainerSuccessfully()
         using var app = builder.Build();
         await app.StartAsync();
 
+        await WaitForResourceAsync(app, "testcontainer", "Running");
+
         using var client = app.CreateHttpClient("testcontainer", "http");
 
-        var message = await client.GetStringWithRetryAsync("/aspire.html"); // Proves the container built, ran, and contains customizations!
+        var message = await client.GetStringAsync("/aspire.html");
 
         Assert.Equal($"hello\n", message);
 
@@ -471,7 +471,6 @@ public async Task WithDockerfileWithParameterLaunchesContainerSuccessfully()
 
     [Fact]
     [RequiresDocker]
-    [ActiveIssue("https://github.com/dotnet/aspire/issues/4613")]
     public async Task AddDockerfileWithParameterLaunchesContainerSuccessfully()
     {
         using var builder = TestDistributedApplicationBuilder.Create();
@@ -493,9 +492,11 @@ public async Task AddDockerfileWithParameterLaunchesContainerSuccessfully()
         using var app = builder.Build();
         await app.StartAsync();
 
+        await WaitForResourceAsync(app, "testcontainer", "Running");
+
         using var client = app.CreateHttpClient("testcontainer", "http");
 
-        var message = await client.GetStringWithRetryAsync("/aspire.html"); // Proves the container built, ran, and contains customizations!
+        var message = await client.GetStringAsync("/aspire.html");
 
         Assert.Equal($"hello\n", message);
 
@@ -812,6 +813,12 @@ public async Task AddDockerfileWithValidContextPathValidDockerfileWithExplicitAb
         return (tempContextPath, tempDockerfilePath);
     }
 
+    private static async Task WaitForResourceAsync(DistributedApplication app, string resourceName, string resourceState, TimeSpan? timeout = null)
+    {
+        var rns = app.Services.GetRequiredService<ResourceNotificationService>();
+        await rns.WaitForResourceAsync(resourceName, resourceState).WaitAsync(timeout ?? TimeSpan.FromMinutes(3));
+    }
+
     private const string DefaultMessage = "aspire!";
 
     private const string HelloWorldDockerfile = $$"""
@@ -840,28 +847,3 @@ ARG MESSAGE
         RUN --mount=type=secret,id=ENV_SECRET cp /run/secrets/ENV_SECRET /app/static/ENV_SECRET.txt
         """;
 }
-
-internal static class RetryExtensions
-{
-    private static ResiliencePipeline? s_pipeline;
-
-    public static async Task<string> GetStringWithRetryAsync(this HttpClient client, string uri, CancellationToken cancellationToken = default)
-    {
-        if (s_pipeline is null)
-        {
-            s_pipeline = new ResiliencePipelineBuilder()
-                .AddRetry(new Polly.Retry.RetryStrategyOptions()
-                {
-                    ShouldHandle = new PredicateBuilder()
-                    .Handle<TimeoutRejectedException>()
-                })
-                .AddTimeout(TimeSpan.FromSeconds(120))
-                .Build();
-        }
-
-        return await s_pipeline.ExecuteAsync(
-            async ct => await client.GetStringAsync(uri, ct),
-            cancellationToken
-            );
-    }
-}

tests/Aspire.Hosting.Testing.Tests/TestingFactoryTests.cs

@@ -42,6 +42,10 @@ public void CanGetResources()
     [RequiresDocker]
     public async Task HttpClientGetTest()
     {
+        // Wait for resource to start.
+        var rns = _app.Services.GetRequiredService<ResourceNotificationService>();
+        await rns.WaitForResourceAsync("mywebapp1").WaitAsync(TimeSpan.FromSeconds(60));
+
         var httpClient = _app.CreateHttpClientWithResilience("mywebapp1");
         var result1 = await httpClient.GetFromJsonAsync<WeatherForecast[]>("/weatherforecast");
         Assert.NotNull(result1);
@@ -64,6 +68,10 @@ public async Task SelectsFirstLaunchProfile()
         var profileName = config["AppHost:DefaultLaunchProfileName"];
         Assert.Equal("https", profileName);
 
+        // Wait for resource to start.
+        var rns = _app.Services.GetRequiredService<ResourceNotificationService>();
+        await rns.WaitForResourceAsync("mywebapp1").WaitAsync(TimeSpan.FromSeconds(60));
+
         // Explicitly get the HTTPS endpoint - this is only available on the "https" launch profile.
         var httpClient = _app.CreateHttpClientWithResilience("mywebapp1", "https");
         var result = await httpClient.GetFromJsonAsync<WeatherForecast[]>("/weatherforecast");

tests/Aspire.Hosting.Tests/XunitAttributes.cs

@@ -3,4 +3,4 @@
 
 using Xunit;
 
-[assembly: CollectionBehavior(DisableTestParallelization = true)]
+[assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly)]