8
8
using Microsoft . AspNetCore . Connections ;
9
9
using Microsoft . AspNetCore . Http . Timeouts ;
10
10
using Microsoft . AspNetCore . Testing ;
11
+ using Microsoft . Extensions . Logging ;
11
12
using Microsoft . Net . Http . Headers ;
12
13
13
14
namespace Microsoft . AspNetCore . WebSockets . Test ;
@@ -516,21 +517,19 @@ public async Task WebSocket_Abort_Interrupts_Pending_ReceiveAsync()
516
517
serverSocket = await context . WebSockets . AcceptWebSocketAsync ( ) ;
517
518
socketWasAccepted . Set ( ) ;
518
519
519
- var serverBuffer = new byte [ 1024 ] ;
520
-
521
520
try
522
521
{
523
522
while ( serverSocket . State is WebSocketState . Open or WebSocketState . CloseSent )
524
523
{
525
524
if ( firstReceiveOccured . IsSet )
526
525
{
527
- var pendingResponse = serverSocket . ReceiveAsync ( serverBuffer , default ) ;
526
+ var pendingResponse = serverSocket . ReceiveAsync ( new ArraySegment < byte > ( new byte [ 1024 ] ) , default ) ;
528
527
secondReceiveInitiated . Set ( ) ;
529
528
var response = await pendingResponse ;
530
529
}
531
530
else
532
531
{
533
- var response = await serverSocket . ReceiveAsync ( serverBuffer , default ) ;
532
+ var response = await serverSocket . ReceiveAsync ( new ArraySegment < byte > ( new byte [ 1024 ] ) , default ) ;
534
533
firstReceiveOccured . Set ( ) ;
535
534
}
536
535
}
@@ -543,6 +542,7 @@ public async Task WebSocket_Abort_Interrupts_Pending_ReceiveAsync()
543
542
catch ( Exception ex )
544
543
{
545
544
// Capture this exception so a test failure can give us more information.
545
+ Logger . LogError ( ex , "Unexpected error." ) ;
546
546
receiveException = ex ;
547
547
}
548
548
finally
@@ -592,15 +592,13 @@ public async Task WebSocket_AllowsCancelling_Pending_ReceiveAsync_When_Cancellat
592
592
serverSocket = await context . WebSockets . AcceptWebSocketAsync ( ) ;
593
593
socketWasAccepted . Set ( ) ;
594
594
595
- var serverBuffer = new byte [ 1024 ] ;
596
-
597
595
var finishedWithOperationCancelled = false ;
598
596
599
597
try
600
598
{
601
599
while ( serverSocket . State is WebSocketState . Open or WebSocketState . CloseSent )
602
600
{
603
- var response = await serverSocket . ReceiveAsync ( serverBuffer , cts . Token ) ;
601
+ var response = await serverSocket . ReceiveAsync ( new ArraySegment < byte > ( new byte [ 1024 ] ) , cts . Token ) ;
604
602
firstReceiveOccured . Set ( ) ;
605
603
}
606
604
}
@@ -609,6 +607,11 @@ public async Task WebSocket_AllowsCancelling_Pending_ReceiveAsync_When_Cancellat
609
607
operationWasCancelled . Set ( ) ;
610
608
finishedWithOperationCancelled = true ;
611
609
}
610
+ catch ( Exception ex )
611
+ {
612
+ Logger . LogError ( ex , "Unexpected error." ) ;
613
+ throw ;
614
+ }
612
615
finally
613
616
{
614
617
Assert . True ( finishedWithOperationCancelled ) ;
0 commit comments