PR Feedback

- allow more time for parallel health check
- threadReady -> threadStarted
- keep changes for net8 specific to net8

Author: TimHess

src/Connectors/test/Connectors.Test/RelationalDatabaseHealthContributorTest.cs

@@ -113,8 +113,8 @@ public async Task SQLServer_Not_Connected_Returns_Down_Status()
         result.Details.Should().Contain("service", "Example");
 
         result.Details.Should().ContainKey("error").WhoseValue.As<string>().Should().Match(exception =>
-            exception.StartsWith("SqlException: Connection Timeout Expired.", StringComparison.InvariantCulture) ||
-            exception.StartsWith("SqlException: A network-related or instance-specific error", StringComparison.InvariantCulture));
+            exception.StartsWith("SqlException: Connection Timeout Expired.", StringComparison.Ordinal) ||
+            exception.StartsWith("SqlException: A network-related or instance-specific error", StringComparison.Ordinal));
     }
 
     [Fact(Skip = "Integration test - Requires local SQL Server instance")]

src/Management/test/Endpoint.Test/Actuators/Health/HealthAggregationTest.cs

@@ -408,7 +408,8 @@ public async Task Aggregates_contributors_in_parallel()
             }
             """);
 
-        stopwatch.Elapsed.Should().BeGreaterThan(500.Milliseconds()).And.BeLessThan(6.Seconds());
+        // Upper bound must be less than 2+3+4=9s if contributors ran sequentially.
+        stopwatch.Elapsed.Should().BeGreaterThan(500.Milliseconds()).And.BeLessThan(9.Seconds());
     }
 
     [Fact]

src/Management/test/Endpoint.Test/Actuators/ThreadDump/EventPipeThreadDumperTest.cs

@@ -30,11 +30,15 @@ public async Task Can_resolve_source_location_from_pdb()
         using var loggerFactory = new LoggerFactory([loggerProvider]);
         ILogger<EventPipeThreadDumper> logger = loggerFactory.CreateLogger<EventPipeThreadDumper>();
 
-        // Use a longer collection window to provide enough sample opportunities on a loaded CI runner.
+#if NET8_0
+        // Use a longer collection window on .NET 8 to compensate for the Sleep(0) yield.
         var optionsMonitor = TestOptionsMonitor.Create(new ThreadDumpEndpointOptions
         {
             Duration = 100
         });
+#else
+        var optionsMonitor = new TestOptionsMonitor<ThreadDumpEndpointOptions>();
+#endif
 
         var dumper = new EventPipeThreadDumper(optionsMonitor, logger);
 
@@ -94,16 +98,18 @@ private static class NestedType
     {
         public static void BackgroundThreadCallback(object? argument)
         {
-            (CancellationToken cancellationToken, ManualResetEventSlim threadReady) = ((CancellationToken, ManualResetEventSlim))argument!;
+            (CancellationToken cancellationToken, ManualResetEventSlim threadStarted) = ((CancellationToken, ManualResetEventSlim))argument!;
 
-            threadReady.Set();
+            threadStarted.Set();
 
             while (!cancellationToken.IsCancellationRequested)
             {
                 // Only actively-running threads are shown in the thread dump, so we need to make sure the CPU is in use.
-                // Thread.Sleep(0) yields to allow the EventPipe rundown thread to make progress on .NET 8.
                 Thread.SpinWait(250);
+#if NET8_0
+                // Yield to allow the EventPipe rundown thread to make progress on .NET 8.
                 Thread.Sleep(0);
+#endif
             }
         }
     }