General API and global ask timeout setting fix (#5773)

akkadotnet · Mar 29, 2022 · 339325d · 339325d
1 parent aac587a
commit 339325d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/core/Akka.TestKit/TestKitBase_Expect.cs b/src/core/Akka.TestKit/TestKitBase_Expect.cs
@@ -373,7 +373,7 @@ private T InternalExpectMsg<T>(
             Action<T> msgAssert,
             Action<IActorRef> senderAssert,
             string hint,
-            CancellationToken cancellationToken = default)
+            CancellationToken cancellationToken)
         {
             return InternalExpectMsgAsync(timeout, msgAssert, senderAssert, hint, cancellationToken)
                 .ConfigureAwait(false).GetAwaiter().GetResult();
@@ -475,7 +475,7 @@ public void ExpectNoMsg(CancellationToken cancellationToken = default)
         }
 
         /// <inheritdoc cref="ExpectNoMsg(CancellationToken)"/>
-        public async ValueTask ExpectNoMsgAsync(CancellationToken cancellationToken)
+        public async ValueTask ExpectNoMsgAsync(CancellationToken cancellationToken = default)
         {
             await InternalExpectNoMsgAsync(RemainingOrDefault, cancellationToken)
                 .ConfigureAwait(false);
@@ -596,7 +596,7 @@ public IReadOnlyCollection<T> ExpectMsgAllOf<T>(
 
         public async IAsyncEnumerable<T> ExpectMsgAllOfAsync<T>(
             IReadOnlyCollection<T> messages,
-            CancellationToken cancellationToken = default)
+            [EnumeratorCancellation] CancellationToken cancellationToken = default)
         {
             var enumerable = InternalExpectMsgAllOfAsync(RemainingOrDefault, messages, cancellationToken: cancellationToken)
                 .ConfigureAwait(false).WithCancellation(cancellationToken);

diff --git a/src/core/Akka.Tests.Shared.Internals/AkkaSpec.cs b/src/core/Akka.Tests.Shared.Internals/AkkaSpec.cs
@@ -35,6 +35,7 @@ public abstract class AkkaSpec : Xunit2.TestKit    //AkkaSpec is not part of Tes
             stdout-loglevel = WARNING
             serialize-messages = on
             actor {
+              ask-timeout = 20s
               #default-dispatcher {
               #  executor = fork-join-executor
               #  fork-join-executor {