Yet another try to avoid race condition

Nybus-project · Sep 13, 2015 · 3631ffc · 3631ffc
1 parent 20f606d
commit 3631ffc
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/tests/Tests.MassTransit/MassTransit/MassTransitBusEngineTests.cs b/tests/Tests.MassTransit/MassTransit/MassTransitBusEngineTests.cs
@@ -278,11 +278,14 @@ public async Task TEvent_ErroryStrategy_is_invoked_when_handler_throws()
 
             sut.SubscribeToEvent<TestEvent>(msg =>
             {
-                lock (lockObject)
+                try
                 {
-                    are.Set();
                     throw exception;
                 }
+                finally
+                {
+                    are.Set();
+                }
             });
 
             var message = fixture.Create<EventMessage<TestEvent>>();
@@ -293,6 +296,8 @@ public async Task TEvent_ErroryStrategy_is_invoked_when_handler_throws()
 
             are.WaitOne();
 
+            await Task.Delay(TimeSpan.FromSeconds(2));
+
             mockEventErrorStrategy.Verify(p => p.HandleError(It.IsAny<IConsumeContext<EventMessage<TestEvent>>>(), exception), Times.AtLeastOnce);
         }
 
@@ -345,11 +350,14 @@ public async Task TCommand_ErroryStrategy_is_invoked_when_handler_throws()
 
             sut.SubscribeToCommand<TestCommand>(msg =>
             {
-                lock (lockObject)
+                try
                 {
-                    are.Set();
                     throw exception;
                 }
+                finally
+                {
+                    are.Set();
+                }
             });
 
             var message = fixture.Create<CommandMessage<TestCommand>>();
@@ -360,6 +368,8 @@ public async Task TCommand_ErroryStrategy_is_invoked_when_handler_throws()
 
             are.WaitOne();
 
+            await Task.Delay(TimeSpan.FromSeconds(2));
+
             mockCommandErrorStrategy.Verify(p => p.HandleError(It.IsAny<IConsumeContext<CommandMessage<TestCommand>>>(), exception), Times.AtLeastOnce);
         }