Adjust unit test wait times

petar-m · Apr 30, 2024 · 195a25d · 195a25d
1 parent c33eff0
commit 195a25d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/src/M.EventBrokerSlim/Internal/ThreadPoolEventHandlerRunner.cs b/src/M.EventBrokerSlim/Internal/ThreadPoolEventHandlerRunner.cs
@@ -93,6 +93,11 @@ private static async Task HandleEvent(object state)
         var handler = context.EventHandlerDescriptor!.Handle;
         var errorHandler = context.EventHandlerDescriptor!.OnError;
 
+        if(context.CancellationToken.IsCancellationRequested)
+        {
+            return;
+        }
+
         object? service = null;
         using var scope = context.CreateScope();
         try

diff --git a/test/M.EventBrokerSlim.Tests/EventBrokerTests.cs b/test/M.EventBrokerSlim.Tests/EventBrokerTests.cs
@@ -285,7 +285,7 @@ public async Task Shutdown_WhileHandlingEvent_TaskCancelledException_HandledByOn
             await eventBroker.Publish(@event);
         }
 
-        await Task.Delay(TimeSpan.FromMilliseconds(250));
+        await Task.Delay(TimeSpan.FromMilliseconds(200));
 
         eventBroker.Shutdown();
 

diff --git a/test/M.EventBrokerSlim.Tests/HandlerScopeAndInstanceTests.cs b/test/M.EventBrokerSlim.Tests/HandlerScopeAndInstanceTests.cs
@@ -31,7 +31,7 @@ public async Task Handler_RegisteredAsTransient_Executed_ByDifferentInstances_An
         await eventBroker.Publish(event1);
         await eventBroker.Publish(event2);
 
-        var completed = await eventsRecorder.WaitForExpected(timeout: TimeSpan.FromMilliseconds(50));
+        var completed = await eventsRecorder.WaitForExpected(timeout: TimeSpan.FromMilliseconds(100));
 
         // Assert
         Assert.True(completed);

diff --git a/test/M.EventBrokerSlim.Tests/LoadTests.cs b/test/M.EventBrokerSlim.Tests/LoadTests.cs
@@ -44,7 +44,7 @@ public async Task Load_MultipleHandlers_With_Retry()
             await eventBroker.Publish(new Event3("event", i));
         }
 
-        await eventsTracker.Wait(TimeSpan.FromSeconds(2));
+        await eventsTracker.Wait(TimeSpan.FromSeconds(3));
 
         // Assert
         var counters = eventsTracker.Items

diff --git a/test/M.EventBrokerSlim.Tests/MultipleHandlersTests.cs b/test/M.EventBrokerSlim.Tests/MultipleHandlersTests.cs
@@ -34,7 +34,7 @@ public async Task MultipleHandlers_AllExecuted()
 
         await eventBroker.Publish(testEvent);
 
-        var completed = await eventsRecorder.WaitForExpected(timeout: TimeSpan.FromMilliseconds(50));
+        var completed = await eventsRecorder.WaitForExpected(timeout: TimeSpan.FromMilliseconds(100));
 
         // Assert
         Assert.True(completed);