src/MxGateway.Tests/Galaxy/GalaxyHierarchyRefreshServiceTests.cs

@@ -22,13 +22,23 @@ public sealed class GalaxyHierarchyRefreshServiceTests
         using CancellationTokenSource cts = new();
 
         await service.StartAsync(cts.Token);
+
+        // Wait until the first RefreshAsync has actually been attempted (and
+        // thrown) before cancelling, so cancellation cannot race ahead of the
+        // first-load path under test — this is what made the test flaky under
+        // parallel load.
+        await cache.FirstRefreshAttempted.WaitAsync(TimeSpan.FromSeconds(10));
+
         await cts.CancelAsync();
 
-        // The background loop must have stopped cleanly: ExecuteTask completes
+        // The background loop must have stopped cleanly: ExecuteTask reaches a
-        // (RanToCompletion or Canceled) rather than faulting on the first refresh.
+        // terminal state that is not Faulted (RanToCompletion or Canceled)
+        // rather than faulting on the first refresh. WhenAny is used so a
+        // Canceled task does not rethrow before the IsFaulted assertion.
         Task? executeTask = service.ExecuteTask;
         Assert.NotNull(executeTask);
-        await executeTask;
+        Task completed = await Task.WhenAny(executeTask, Task.Delay(TimeSpan.FromSeconds(10)));
+        Assert.Same(executeTask, completed);
         Assert.False(executeTask.IsFaulted);
         Assert.Equal(1, cache.RefreshCallCount);
 
@@ -49,13 +59,20 @@ public sealed class GalaxyHierarchyRefreshServiceTests
 
     private sealed class ThrowingCache(Exception toThrow) : IGalaxyHierarchyCache
     {
+        private readonly TaskCompletionSource firstRefreshAttempted =
+            new(TaskCreationOptions.RunContinuationsAsynchronously);
+
         public int RefreshCallCount { get; private set; }
 
+        /// <summary>Completes once <see cref="RefreshAsync"/> has been invoked at least once.</summary>
+        public Task FirstRefreshAttempted => firstRefreshAttempted.Task;
+
         public GalaxyHierarchyCacheEntry Current => GalaxyHierarchyCacheEntry.Empty;
 
         public Task RefreshAsync(CancellationToken cancellationToken)
         {
             RefreshCallCount++;
+            firstRefreshAttempted.TrySetResult();
             throw toThrow;
         }