Improve Elasticsearch functional tests reliability (#7014)

dotnet · Jan 14, 2025 · 3cf908b · 3cf908b
1 parent 66465d1
commit 3cf908b
Showing 1 changed file with 33 additions and 3 deletions.
diff --git a/tests/Aspire.Hosting.Elasticsearch.Tests/ElasticsearchFunctionalTests.cs b/tests/Aspire.Hosting.Elasticsearch.Tests/ElasticsearchFunctionalTests.cs
@@ -42,6 +42,9 @@ public async Task VerifyElasticsearchResource()
 
         await app.StartAsync();
 
+        var rns = app.Services.GetRequiredService<ResourceNotificationService>();
+        await rns.WaitForResourceHealthyAsync(elasticsearch.Resource.Name, cts.Token);
+
         var hb = Host.CreateApplicationBuilder();
 
         hb.Configuration[$"ConnectionStrings:{elasticsearch.Resource.Name}"] = await elasticsearch.Resource.ConnectionStringExpression.GetValueAsync(default);
@@ -101,7 +104,10 @@ public async Task WithDataShouldPersistStateBetweenUsages(bool useVolume)
 
             using (var app = builder1.Build())
             {
-                await app.StartAsync();
+                await app.StartAsync(cts.Token);
+
+                var rns = app.Services.GetRequiredService<ResourceNotificationService>();
+                await rns.WaitForResourceHealthyAsync(elasticsearch1.Resource.Name, cts.Token);
 
                 try
                 {
@@ -121,6 +127,17 @@ await pipeline.ExecuteAsync(
                                 var elasticsearchClient = host.Services.GetRequiredService<ElasticsearchClient>();
                                 await CreateTestData(elasticsearchClient, testOutputHelper, token);
                             }, cts.Token);
+
+                        await app.StopAsync();
+
+                        // Wait for the container to be stopped and to release the volume files before continuing
+                        await pipeline.ExecuteAsync(
+                            async token =>
+                            {
+                                var elasticsearchClient = host.Services.GetRequiredService<ElasticsearchClient>();
+                                var getResponse = await elasticsearchClient.GetAsync<Person>(IndexName, s_person.Id, token);
+                                Assert.False(getResponse.IsSuccess());
+                            }, cts.Token);
                     }
                 }
                 finally
@@ -148,6 +165,9 @@ await pipeline.ExecuteAsync(
             {
                 await app.StartAsync();
 
+                var rns = app.Services.GetRequiredService<ResourceNotificationService>();
+                await rns.WaitForResourceHealthyAsync(elasticsearch2.Resource.Name, cts.Token);
+
                 try
                 {
                     var hb = Host.CreateApplicationBuilder();
@@ -171,6 +191,16 @@ await pipeline.ExecuteAsync(
                                 Assert.Equal(s_person.Id, getResponse.Source?.Id);
                             }, cts.Token);
 
+                        await app.StopAsync();
+
+                        // Wait for the container to be stopped and to release the volume files before continuing
+                        await pipeline.ExecuteAsync(
+                            async token =>
+                            {
+                                var elasticsearchClient = host.Services.GetRequiredService<ElasticsearchClient>();
+                                var getResponse = await elasticsearchClient.GetAsync<Person>(IndexName, s_person.Id, token);
+                                Assert.False(getResponse.IsSuccess());
+                            }, cts.Token);
                     }
                 }
                 finally
@@ -219,7 +249,7 @@ public async Task VerifyWaitForOnElasticsearchBlocksDependentResources()
         var resource = builder.AddElasticsearch("resource")
                               .WithHealthCheck("blocking_check");
 
-        var dependentResource = builder.AddElasticsearch("dependentresource")
+        var dependentResource = builder.AddContainer("nginx", "mcr.microsoft.com/cbl-mariner/base/nginx", "1.22")
                                        .WaitFor(resource);
 
         using var app = builder.Build();
@@ -234,7 +264,7 @@ public async Task VerifyWaitForOnElasticsearchBlocksDependentResources()
 
         healthCheckTcs.SetResult(HealthCheckResult.Healthy());
 
-        await rns.WaitForResourceAsync(resource.Resource.Name, (re => re.Snapshot.HealthStatus == Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus.Healthy), cts.Token);
+        await rns.WaitForResourceHealthyAsync(resource.Resource.Name, cts.Token);
 
         await rns.WaitForResourceAsync(dependentResource.Resource.Name, KnownResourceStates.Running, cts.Token);