Throw on timeout.

Lombiq · Sep 16, 2024 · 4a58ae7 · 4a58ae7
1 parent 03a5bf7
commit 4a58ae7
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/Lombiq.Tests.UI/Services/FrontendServer.cs b/Lombiq.Tests.UI/Services/FrontendServer.cs
@@ -137,13 +137,25 @@ public void Configure(
     private string GetKey(int orchardPort) =>
         StringHelper.CreateInvariant($"{nameof(FrontendServer)}:{Name}:{orchardPort}");
 
-    private static Task WaitForStartupAsync(Task mainTask, Task waitTask, TimeSpan? timeout)
+    private static async Task WaitForStartupAsync(Task mainTask, Task waitTask, TimeSpan? timeout)
     {
         var tasks = new List<Task>(capacity: 3) { mainTask, waitTask };
-        if (timeout.HasValue) tasks.Add(Task.Delay(timeout.Value, default(CancellationToken)));
+
+        Task? timeoutTask = null;
+        if (timeout.HasValue)
+        {
+            timeoutTask = Task.Delay(timeout.Value, default(CancellationToken));
+            tasks.Add(timeoutTask);
+        }
 
         // Use WhenAny in case the CLI task fails before the wait task completes. This prevents hangs.
-        return Task.WhenAny(tasks).Unwrap();
+        await Task.WhenAny(tasks).Unwrap();
+
+        if (timeoutTask?.IsCompleted == true)
+        {
+            throw new TimeoutException(StringHelper.CreateInvariant(
+                $"The timeout of {nameof(FrontendServer)} ({timeout}) is exceeded."));
+        }
     }
 
     public record Context(