Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit ddc7fdf

Browse files
committed
Fix tests to pass with recent cleanup Begin/End for IO in PipeStream
The reason for this change is that previous cancellation implementation of async IO was based on throwing OCE (directly or via CancellationToken.ThrowIfCancellationRequested). Since switching to TaskCompletionSource we use its SetCanceled method which propagate on task TaskCanceledException instead of OCE.
1 parent 2732ffa commit ddc7fdf

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/System.IO.Pipes/tests/NamedPipeTests/NamedPipeTest.Simple.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -498,15 +498,15 @@ public async Task Server_ReadWriteCancelledToken_Throws_OperationCanceledExcepti
498498
var ctx1 = new CancellationTokenSource();
499499
Task serverReadToken = server.ReadAsync(buffer, 0, buffer.Length, ctx1.Token);
500500
ctx1.Cancel();
501-
await Assert.ThrowsAsync<OperationCanceledException>(() => serverReadToken);
501+
await Assert.ThrowsAnyAsync<OperationCanceledException>(() => serverReadToken);
502502
Assert.True(server.ReadAsync(buffer, 0, buffer.Length, ctx1.Token).IsCanceled);
503503
}
504504
if (server.CanWrite)
505505
{
506506
var ctx1 = new CancellationTokenSource();
507507
Task serverWriteToken = server.WriteAsync(buffer, 0, buffer.Length, ctx1.Token);
508508
ctx1.Cancel();
509-
await Assert.ThrowsAsync<OperationCanceledException>(() => serverWriteToken);
509+
await Assert.ThrowsAnyAsync<OperationCanceledException>(() => serverWriteToken);
510510
Assert.True(server.WriteAsync(buffer, 0, buffer.Length, ctx1.Token).IsCanceled);
511511
}
512512
}
@@ -587,15 +587,15 @@ public async Task Client_ReadWriteCancelledToken_Throws_OperationCanceledExcepti
587587
var ctx1 = new CancellationTokenSource();
588588
Task serverReadToken = client.ReadAsync(buffer, 0, buffer.Length, ctx1.Token);
589589
ctx1.Cancel();
590-
await Assert.ThrowsAsync<OperationCanceledException>(() => serverReadToken);
590+
await Assert.ThrowsAnyAsync<OperationCanceledException>(() => serverReadToken);
591591
Assert.True(client.ReadAsync(buffer, 0, buffer.Length, ctx1.Token).IsCanceled);
592592
}
593593
if (client.CanWrite)
594594
{
595595
var ctx1 = new CancellationTokenSource();
596596
Task serverWriteToken = client.WriteAsync(buffer, 0, buffer.Length, ctx1.Token);
597597
ctx1.Cancel();
598-
await Assert.ThrowsAsync<OperationCanceledException>(() => serverWriteToken);
598+
await Assert.ThrowsAnyAsync<OperationCanceledException>(() => serverWriteToken);
599599
Assert.True(client.WriteAsync(buffer, 0, buffer.Length, ctx1.Token).IsCanceled);
600600
}
601601
}

0 commit comments

Comments
 (0)