Fix for unit tests failing. (#2029)

Co-authored-by: Mitch Denny <midenn@microsoft.com>
dotnet · Feb 1, 2024 · a181d33 · a181d33
1 parent bd64561
commit a181d33
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/Aspire.Hosting/DistributedApplication.cs b/src/Aspire.Hosting/DistributedApplication.cs
@@ -111,8 +111,8 @@ public ValueTask DisposeAsync()
     /// <inheritdoc cref="IHost.StartAsync" />
     public async Task StartAsync(CancellationToken cancellationToken = default)
     {
-        await _host.StartAsync(cancellationToken).ConfigureAwait(false);
         await ExecuteBeforeStartHooksAsync(cancellationToken).ConfigureAwait(false);
+        await _host.StartAsync(cancellationToken).ConfigureAwait(false);
     }
 
     /// <inheritdoc cref="IHost.StopAsync" />

diff --git a/tests/Aspire.Hosting.Tests/TestProgramFixture.cs b/tests/Aspire.Hosting.Tests/TestProgramFixture.cs
@@ -39,7 +39,7 @@ public async Task InitializeAsync()
 
         _httpClient = _app.Services.GetRequiredService<IHttpClientFactory>().CreateClient();
 
-        using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(1));
+        using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(5));
 
         await _app.StartAsync(cts.Token);
 
@@ -105,7 +105,11 @@ public override TestProgram CreateTestProgram()
             .AddHttpClient()
             .ConfigureHttpClientDefaults(b =>
             {
-                b.UseSocketsHttpHandler((handler, sp) => handler.PooledConnectionLifetime = TimeSpan.FromSeconds(5));
+                b.UseSocketsHttpHandler((handler, sp) =>
+                {
+                    handler.PooledConnectionLifetime = TimeSpan.FromSeconds(5);
+                    handler.ConnectTimeout = TimeSpan.FromSeconds(5);
+                });
 
                 // Ensure transient errors are retried.
                 b.AddStandardResilienceHandler();

diff --git a/tests/Aspire.Hosting.Tests/XunitAttributes.cs b/tests/Aspire.Hosting.Tests/XunitAttributes.cs
@@ -0,0 +1,6 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Xunit;
+
+[assembly: CollectionBehavior(DisableTestParallelization = true)]