Fixed dispatcher test failure, fixes #167

1 files changed, 4 insertions, 1 deletions

diff --git a/csharp/test/Ice/dispatcher/AllTests.cs b/csharp/test/Ice/dispatcher/AllTests.cs
index ff9ee284ff3..7f032bd2d53 100644
--- a/csharp/test/Ice/dispatcher/AllTests.cs
+++ b/csharp/test/Ice/dispatcher/AllTests.cs
@@ -197,6 +197,9 @@ public class AllTests : Test.AllTests
             // Expect InvocationTimeoutException.
             //
             {
+                // The continuation might be (rarely) executed on the current thread if the setup of the
+                // continuation occurs after the invocation timeout.
+                var thread = Thread.CurrentThread;
                 Test.TestIntfPrx to = Test.TestIntfPrxHelper.uncheckedCast(p.ice_invocationTimeout(20));
                 to.sleepAsync(500).ContinueWith(
                     previous =>
@@ -209,7 +212,7 @@ public class AllTests : Test.AllTests
                         catch(System.AggregateException ex)
                         {
                             test(ex.InnerException is Ice.InvocationTimeoutException);
-                            test(Dispatcher.isDispatcherThread());
+                            test(Dispatcher.isDispatcherThread() || thread == Thread.CurrentThread);
                         }
                     }, TaskContinuationOptions.ExecuteSynchronously).Wait();
             }