Skip to content

Commit a8140b1

Browse files
committed
Fixing timings issues
1 parent 36399e3 commit a8140b1

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

tests/IcedTasks.Tests/CancellableTaskTests.fs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -454,12 +454,12 @@ module CancellableTaskTests =
454454
testCaseAsync "use IAsyncDisposable cancelled"
455455
<| async {
456456
let data = 42
457-
let mutable wasDisposed = false
457+
let mutable wasDisposed = TaskCompletionSource<bool>()
458458

459459
let doDispose () =
460460
task {
461461
do! Task.Yield()
462-
wasDisposed <- true
462+
wasDisposed.SetResult true
463463
}
464464
|> ValueTask
465465

@@ -482,7 +482,13 @@ module CancellableTaskTests =
482482
|> Async.AwaitTask
483483

484484

485-
let _ = Expect.CancellationRequested inProgress
485+
let! _ =
486+
Expect.CancellationRequested inProgress
487+
|> Async.AwaitTask
488+
489+
let! wasDisposed =
490+
wasDisposed.Task
491+
|> Async.AwaitTask
486492

487493
Expect.isTrue wasDisposed ""
488494
}

tests/IcedTasks.Tests/CancellableValueTaskTests.fs

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -470,12 +470,12 @@ module CancellableValueTaskTests =
470470
testCaseAsync "use IAsyncDisposable cancelled"
471471
<| async {
472472
let data = 42
473-
let mutable wasDisposed = false
473+
let mutable wasDisposed = TaskCompletionSource<bool>()
474474

475475
let doDispose () =
476476
task {
477477
do! Task.Yield()
478-
wasDisposed <- true
478+
wasDisposed.SetResult true
479479
}
480480
|> ValueTask
481481

@@ -497,16 +497,13 @@ module CancellableValueTaskTests =
497497
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100))
498498
|> Async.AwaitTask
499499

500-
let _ = Expect.CancellationRequested inProgress
501-
502-
// try
503-
// let! _ =
504-
// inProgress
505-
// |> Async.AwaitValueTask
500+
let! _ =
501+
Expect.CancellationRequested inProgress
502+
|> Async.AwaitValueTask
506503

507-
// ()
508-
// with (:? OperationCanceledException) ->
509-
// ()
504+
let! wasDisposed =
505+
wasDisposed.Task
506+
|> Async.AwaitTask
510507

511508
Expect.isTrue wasDisposed ""
512509
}

0 commit comments

Comments
 (0)