add test and fix dotnet#3254

matthid · Jun 24, 2017 · 3d0d28a · 3d0d28a
1 parent a29abe3
commit 3d0d28a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs b/src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Control/AsyncType.fs
@@ -162,7 +162,22 @@ type AsyncType() =
         this.WaitASec t
         Assert.IsTrue (t.IsCompleted)
         Assert.AreEqual(s, t.Result)    
-
+
+    [<Test>]
+    member this.RunSynchronouslyCancellationWithDelayedResult () =
+        let cts = new CancellationTokenSource()
+        let tcs = TaskCompletionSource<int>()
+        let _ = cts.Token.Register(fun () -> tcs.SetResult 42)
+        let a = async {
+            cts.CancelAfter (100)
+            let! result = tcs.Task |> Async.AwaitTask
+            return result }
+
+        try
+            Async.RunSynchronously(a, cancellationToken = cts.Token)
+                |> ignore
+        with :? OperationCanceledException as o -> ()
+
     [<Test>]
     member this.ExceptionPropagatesToTask () =
         let a = async { 

diff --git a/src/fsharp/FSharp.Core/control.fs b/src/fsharp/FSharp.Core/control.fs
@@ -1557,7 +1557,7 @@ namespace Microsoft.FSharp.Control
                     else
                         args.cont completedTask.Result)) |> unfake
 
-            task.ContinueWith(Action<Task<'T>>(continuation), continueWithExtra args.aux.token) |> ignore |> fake
+            task.ContinueWith(Action<Task<'T>>(continuation)) |> ignore |> fake
 
         let continueWithUnit (task : Task, args, useCcontForTaskCancellation) = 
 
@@ -1572,7 +1572,7 @@ namespace Microsoft.FSharp.Control
                     else
                         args.cont ())) |> unfake
 
-            task.ContinueWith(Action<Task>(continuation), continueWithExtra args.aux.token) |> ignore |> fake
+            task.ContinueWith(Action<Task>(continuation)) |> ignore |> fake
 #endif
 
 #if FX_NO_REGISTERED_WAIT_HANDLES