Fix ClusterLogSpec, EventFilter does not play nice with Within (#6041)

* Fix ClusterLogSpec, EventFilter can not be used inside Within * Fix timeout
akkadotnet · Jul 13, 2022 · 32040a3 · 32040a3
1 parent b21f5fa
commit 32040a3
Showing 1 changed file with 15 additions and 21 deletions.
diff --git a/src/core/Akka.Cluster.Tests/ClusterLogSpec.cs b/src/core/Akka.Cluster.Tests/ClusterLogSpec.cs
@@ -64,20 +64,17 @@ protected async Task AwaitUpAsync()
         /// </summary>
         protected async Task JoinAsync(string expected)
         {
-            await WithinAsync(TimeSpan.FromSeconds(10), async () =>
-            {
-                await EventFilter
-                    .Info(contains: expected)
-                    .ExpectOneAsync(async () => {
-                        var tcs = new TaskCompletionSource<bool>();
-                         _cluster.RegisterOnMemberUp(() =>
-                            {
-                                tcs.TrySetResult(true);
-                            });
-                        _cluster.Join(_selfAddress);
-                        await tcs.Task.ShouldCompleteWithin(Remaining);   
+            await EventFilter
+                .Info(contains: expected)
+                .ExpectOneAsync(10.Seconds(), async () => {
+                    var tcs = new TaskCompletionSource<bool>();
+                    _cluster.RegisterOnMemberUp(() =>
+                    {
+                        tcs.TrySetResult(true);
                     });
-            });
+                    _cluster.Join(_selfAddress);
+                    await tcs.Task.ShouldCompleteWithin(10.Seconds());
+                });
         }
 
         /// <summary>
@@ -86,21 +83,18 @@ await EventFilter
         /// <param name="expected"></param>
         protected async Task DownAsync(string expected)
         {
-            await WithinAsync(TimeSpan.FromSeconds(10), async () =>
-            {
-                await EventFilter
+            await EventFilter
                 .Info(contains: expected)
-                .ExpectOneAsync(async () =>
+                .ExpectOneAsync(10.Seconds(), async () =>
                 {
                     var tcs = new TaskCompletionSource<bool>();
                     _cluster.RegisterOnMemberRemoved(() =>
                     {
                         tcs.TrySetResult(true);
                     });
                     _cluster.Down(_selfAddress);
-                    await tcs.Task.ShouldCompleteWithin(Remaining);
+                    await tcs.Task.ShouldCompleteWithin(10.Seconds());
                 });
-            });
         }
     }
 
@@ -131,9 +125,9 @@ public ClusterLogVerboseDefaultSpec(ITestOutputHelper output)
         public async Task A_cluster_must_not_log_verbose_cluster_events_by_default()
         {
             _cluster.Settings.LogInfoVerbose.ShouldBeFalse();
-            await JoinAsync(upLogMessage).ShouldThrowWithin<TrueException>(10.Seconds());
+            await JoinAsync(upLogMessage).ShouldThrowWithin<TrueException>(11.Seconds());
             await AwaitUpAsync();
-            await DownAsync(downLogMessage).ShouldThrowWithin<TrueException>(10.Seconds());
+            await DownAsync(downLogMessage).ShouldThrowWithin<TrueException>(11.Seconds());
         }
     }