Ask deadlock test added #3220

akkadotnet · Jan 2, 2018 · 152d0c1 · 152d0c1
1 parent d9ddb1d
commit 152d0c1
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 2 deletions.
diff --git a/...xt/AsyncContext.SynchronizationContext.cs → ...xt/AsyncContext.SynchronizationContext.cs b/...xt/AsyncContext.SynchronizationContext.cs → ...xt/AsyncContext.SynchronizationContext.cs
diff --git a/...ts/AsyncContext/AsyncContext.TaskQueue.cs → ...ls/AsyncContext/AsyncContext.TaskQueue.cs b/...ts/AsyncContext/AsyncContext.TaskQueue.cs → ...ls/AsyncContext/AsyncContext.TaskQueue.cs
diff --git a/...syncContext/AsyncContext.TaskScheduler.cs → ...syncContext/AsyncContext.TaskScheduler.cs b/...syncContext/AsyncContext.TaskScheduler.cs → ...syncContext/AsyncContext.TaskScheduler.cs
diff --git a/...Remote.Tests/AsyncContext/AsyncContext.cs → ...ed.Internals/AsyncContext/AsyncContext.cs b/...Remote.Tests/AsyncContext/AsyncContext.cs → ...ed.Internals/AsyncContext/AsyncContext.cs
diff --git a/...Remote.Tests/AsyncContext/AsyncEx.LICENSE → ...ed.Internals/AsyncContext/AsyncEx.LICENSE b/...Remote.Tests/AsyncContext/AsyncEx.LICENSE → ...ed.Internals/AsyncContext/AsyncEx.LICENSE
diff --git a/....Remote.Tests/AsyncContext/BoundAction.cs → ...red.Internals/AsyncContext/BoundAction.cs b/....Remote.Tests/AsyncContext/BoundAction.cs → ...red.Internals/AsyncContext/BoundAction.cs
diff --git a/...te.Tests/AsyncContext/Disposables.LICENSE → ...nternals/AsyncContext/Disposables.LICENSE b/...te.Tests/AsyncContext/Disposables.LICENSE → ...nternals/AsyncContext/Disposables.LICENSE
diff --git a/...te.Tests/AsyncContext/ExceptionHelpers.cs → ...nternals/AsyncContext/ExceptionHelpers.cs b/...te.Tests/AsyncContext/ExceptionHelpers.cs → ...nternals/AsyncContext/ExceptionHelpers.cs
diff --git a/...s/AsyncContext/SingleDisposable (of T).cs → ...s/AsyncContext/SingleDisposable (of T).cs b/...s/AsyncContext/SingleDisposable (of T).cs → ...s/AsyncContext/SingleDisposable (of T).cs
diff --git a/...Context/SynchronizationContextSwitcher.cs → ...Context/SynchronizationContextSwitcher.cs b/...Context/SynchronizationContextSwitcher.cs → ...Context/SynchronizationContextSwitcher.cs
diff --git a/...ncContext/SynchronousTaskExtensions.cs.cs → ...ncContext/SynchronousTaskExtensions.cs.cs b/...ncContext/SynchronousTaskExtensions.cs.cs → ...ncContext/SynchronousTaskExtensions.cs.cs
diff --git a/.../Akka.Remote.Tests/AsyncContext/about.txt → ...s.Shared.Internals/AsyncContext/about.txt b/.../Akka.Remote.Tests/AsyncContext/about.txt → ...s.Shared.Internals/AsyncContext/about.txt
diff --git a/src/core/Akka.Tests/Actor/AskSpec.cs b/src/core/Akka.Tests/Actor/AskSpec.cs
@@ -11,6 +11,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Nito.AsyncEx;
 
 namespace Akka.Tests.Actor
 {
@@ -39,9 +40,9 @@ public WaitActor(IActorRef replyActor, IActorRef testActor)
                 _testActor = testActor;
             }
 
-            private IActorRef _replyActor;
+            private readonly IActorRef _replyActor;
 
-            private IActorRef _testActor;
+            private readonly IActorRef _testActor;
 
             protected override void OnReceive(object message)
             {
@@ -132,6 +133,17 @@ public async Task ShouldFailWhenAskExpectsWrongType()
             await Assert.ThrowsAsync<InvalidCastException>(async () => await actor.Ask<int>("answer"));
         }
 
+        [Fact]
+        public void AskDoesNotDeadlockWhenWaitForResultInGuiApplication()
+        {
+            AsyncContext.Run(() =>
+            {
+                var actor = Sys.ActorOf<SomeActor>();
+                var res = actor.Ask<string>("answer").Result; // blocking on purpose
+                res.ShouldBe("answer");
+            });
+        }
+
         private void Are_Temp_Actors_Removed(IActorRef actor)
         {
             var actorCell = actor as ActorRefWithCell;