@@ -60,7 +60,7 @@ public async Task SendRecv_Stream_TCP(IPAddress listenAt, bool useMultipleBuffer
6060
6161 Task serverProcessingTask = Task . Run ( async ( ) =>
6262 {
63- using ( Socket remote = await AcceptAsync ( server ) )
63+ using ( Socket remote = await AcceptAsync ( server ) . WaitAsync ( TestSettings . PassingTestTimeout ) )
6464 {
6565 if ( ! useMultipleBuffers )
6666 {
@@ -109,7 +109,7 @@ public async Task SendRecv_Stream_TCP(IPAddress listenAt, bool useMultipleBuffer
109109 EndPoint clientEndpoint = server . LocalEndPoint ;
110110 using ( var client = new Socket ( clientEndpoint . AddressFamily , SocketType . Stream , ProtocolType . Tcp ) )
111111 {
112- await ConnectAsync ( client , clientEndpoint ) ;
112+ await ConnectAsync ( client , clientEndpoint ) . WaitAsync ( TestSettings . PassingTestTimeout ) ;
113113
114114 var random = new Random ( ) ;
115115 if ( ! useMultipleBuffers )
@@ -152,7 +152,7 @@ public async Task SendRecv_Stream_TCP(IPAddress listenAt, bool useMultipleBuffer
152152
153153 client . LingerState = new LingerOption ( true , LingerTime ) ;
154154 client . Shutdown ( SocketShutdown . Send ) ;
155- await serverProcessingTask ;
155+ await serverProcessingTask . WaitAsync ( TestSettings . PassingTestTimeout ) ;
156156 }
157157
158158 Assert . Equal ( bytesSent , bytesReceived ) ;
@@ -231,7 +231,7 @@ public async Task SendRecv_Stream_TCP_AlternateBufferAndBufferList(IPAddress lis
231231
232232 Task serverProcessingTask = Task . Run ( async ( ) =>
233233 {
234- using ( Socket remote = await AcceptAsync ( server ) )
234+ using ( Socket remote = await AcceptAsync ( server ) . WaitAsync ( TestSettings . PassingTestTimeout ) )
235235 {
236236 byte [ ] recvBuffer1 = new byte [ 256 ] , recvBuffer2 = new byte [ 256 ] ;
237237 long iter = 0 ;
@@ -269,7 +269,7 @@ public async Task SendRecv_Stream_TCP_AlternateBufferAndBufferList(IPAddress lis
269269 EndPoint clientEndpoint = server . LocalEndPoint ;
270270 using ( var client = new Socket ( clientEndpoint . AddressFamily , SocketType . Stream , ProtocolType . Tcp ) )
271271 {
272- await ConnectAsync ( client , clientEndpoint ) ;
272+ await ConnectAsync ( client , clientEndpoint ) . WaitAsync ( TestSettings . PassingTestTimeout ) ;
273273
274274 var random = new Random ( ) ;
275275 byte [ ] sendBuffer1 = new byte [ 512 ] , sendBuffer2 = new byte [ 512 ] ;
@@ -308,7 +308,7 @@ public async Task SendRecv_Stream_TCP_AlternateBufferAndBufferList(IPAddress lis
308308 }
309309
310310 client . Shutdown ( SocketShutdown . Send ) ;
311- await serverProcessingTask ;
311+ await serverProcessingTask . WaitAsync ( TestSettings . PassingTestTimeout ) ;
312312 }
313313
314314 Assert . Equal ( bytesSent , bytesReceived ) ;
@@ -330,7 +330,7 @@ public async Task SendRecv_Stream_TCP_MultipleConcurrentReceives(IPAddress liste
330330 using ( var client = new Socket ( clientEndpoint . AddressFamily , SocketType . Stream , ProtocolType . Tcp ) )
331331 {
332332 Task clientConnect = ConnectAsync ( client , clientEndpoint ) ;
333- using ( Socket remote = await AcceptAsync ( server ) )
333+ using ( Socket remote = await AcceptAsync ( server ) . WaitAsync ( TestSettings . PassingTestTimeout ) )
334334 {
335335 await clientConnect . WaitAsync ( TestSettings . PassingTestTimeout ) ;
336336
@@ -440,9 +440,9 @@ public async Task SendRecv_Stream_TCP_MultipleConcurrentSends(IPAddress listenAt
440440 using ( var client = new Socket ( clientEndpoint . AddressFamily , SocketType . Stream , ProtocolType . Tcp ) )
441441 {
442442 Task clientConnect = ConnectAsync ( client , clientEndpoint ) ;
443- using ( Socket remote = await AcceptAsync ( server ) )
443+ using ( Socket remote = await AcceptAsync ( server ) . WaitAsync ( TestSettings . PassingTestTimeout ) )
444444 {
445- await clientConnect ;
445+ await clientConnect . WaitAsync ( TestSettings . PassingTestTimeout ) ;
446446
447447 Task < int > send1 , send2 , send3 ;
448448 if ( useMultipleBuffers )
@@ -503,7 +503,7 @@ public async Task SendRecvPollSync_TcpListener_Socket(IPAddress listenAt, bool p
503503 _output ? . WriteLine ( $ "{ DateTime . Now } Starting listener at { listener . LocalEndpoint } ") ;
504504 Task serverTask = Task . Run ( async ( ) =>
505505 {
506- using ( Socket remote = await listener . AcceptSocketAsync ( ) )
506+ using ( Socket remote = await listener . AcceptSocketAsync ( ) . WaitAsync ( TestSettings . PassingTestTimeout ) )
507507 {
508508 var recvBuffer = new byte [ 256 ] ;
509509 int count = 0 ;
@@ -537,7 +537,7 @@ public async Task SendRecvPollSync_TcpListener_Socket(IPAddress listenAt, bool p
537537
538538 using ( var client = new Socket ( clientEndpoint . AddressFamily , SocketType . Stream , ProtocolType . Tcp ) )
539539 {
540- await ConnectAsync ( client , clientEndpoint ) ;
540+ await ConnectAsync ( client , clientEndpoint ) . WaitAsync ( TestSettings . PassingTestTimeout ) ;
541541
542542 if ( pollBeforeOperation )
543543 {
@@ -592,7 +592,8 @@ public async Task Send_0ByteSend_Success()
592592 Task < Socket > acceptTask = AcceptAsync ( listener ) ;
593593 await Task . WhenAll (
594594 acceptTask ,
595- ConnectAsync ( client , new IPEndPoint ( IPAddress . Loopback , ( ( IPEndPoint ) listener . LocalEndPoint ) . Port ) ) ) ;
595+ ConnectAsync ( client , new IPEndPoint ( IPAddress . Loopback , ( ( IPEndPoint ) listener . LocalEndPoint ) . Port ) ) )
596+ . WaitAsync ( TestSettings . PassingTestTimeout ) ;
596597
597598 using ( Socket server = await acceptTask )
598599 {
@@ -625,7 +626,8 @@ public async Task SendRecv_0ByteReceive_Success()
625626 Task < Socket > acceptTask = AcceptAsync ( listener ) ;
626627 await Task . WhenAll (
627628 acceptTask ,
628- ConnectAsync ( client , new IPEndPoint ( IPAddress . Loopback , ( ( IPEndPoint ) listener . LocalEndPoint ) . Port ) ) ) ;
629+ ConnectAsync ( client , new IPEndPoint ( IPAddress . Loopback , ( ( IPEndPoint ) listener . LocalEndPoint ) . Port ) ) )
630+ . WaitAsync ( TestSettings . PassingTestTimeout ) ;
629631
630632 using ( Socket server = await acceptTask )
631633 {
@@ -682,7 +684,7 @@ public async Task Send_0ByteSendTo_Success()
682684 Assert . Equal ( client . LocalEndPoint , result . RemoteEndPoint ) ;
683685
684686 // Read real packet.
685- result = await ReceiveFromAsync ( server , buffer , new IPEndPoint ( IPAddress . Any , 0 ) ) ;
687+ result = await ReceiveFromAsync ( server , buffer , new IPEndPoint ( IPAddress . Any , 0 ) ) . WaitAsync ( TestSettings . PassingTestTimeout ) ;
686688
687689 Assert . Equal ( 1 , result . ReceivedBytes ) ;
688690 Assert . Equal ( client . LocalEndPoint , result . RemoteEndPoint ) ;
@@ -703,7 +705,8 @@ public async Task Receive0ByteReturns_WhenPeerDisconnects()
703705 Task < Socket > acceptTask = AcceptAsync ( listener ) ;
704706 await Task . WhenAll (
705707 acceptTask ,
706- ConnectAsync ( client , new IPEndPoint ( IPAddress . Loopback , ( ( IPEndPoint ) listener . LocalEndPoint ) . Port ) ) ) ;
708+ ConnectAsync ( client , new IPEndPoint ( IPAddress . Loopback , ( ( IPEndPoint ) listener . LocalEndPoint ) . Port ) ) )
709+ . WaitAsync ( TestSettings . PassingTestTimeout ) ;
707710
708711 using ( Socket server = await acceptTask )
709712 {
@@ -743,7 +746,8 @@ public async Task SendRecv_BlockingNonBlocking_LingerTimeout_Success(bool blocki
743746 Task < Socket > acceptTask = AcceptAsync ( listener ) ;
744747 await Task . WhenAll (
745748 acceptTask ,
746- ConnectAsync ( client , new IPEndPoint ( IPAddress . Loopback , ( ( IPEndPoint ) listener . LocalEndPoint ) . Port ) ) ) ;
749+ ConnectAsync ( client , new IPEndPoint ( IPAddress . Loopback , ( ( IPEndPoint ) listener . LocalEndPoint ) . Port ) ) )
750+ . WaitAsync ( TestSettings . PassingTestTimeout ) ;
747751
748752 using ( Socket server = await acceptTask )
749753 {
@@ -773,7 +777,8 @@ public async Task SendRecv_NoBuffering_Success()
773777 Task < Socket > acceptTask = AcceptAsync ( listener ) ;
774778 await Task . WhenAll (
775779 acceptTask ,
776- ConnectAsync ( client , new IPEndPoint ( IPAddress . Loopback , ( ( IPEndPoint ) listener . LocalEndPoint ) . Port ) ) ) ;
780+ ConnectAsync ( client , new IPEndPoint ( IPAddress . Loopback , ( ( IPEndPoint ) listener . LocalEndPoint ) . Port ) ) )
781+ . WaitAsync ( TestSettings . PassingTestTimeout ) ;
777782
778783 using ( Socket server = await acceptTask )
779784 {
@@ -812,7 +817,8 @@ public async Task SendRecv_DisposeDuringPendingReceive_ThrowsSocketException()
812817 Task < Socket > acceptTask = AcceptAsync ( listener ) ;
813818 await Task . WhenAll (
814819 acceptTask ,
815- ConnectAsync ( client , new IPEndPoint ( IPAddress . Loopback , ( ( IPEndPoint ) listener . LocalEndPoint ) . Port ) ) ) ;
820+ ConnectAsync ( client , new IPEndPoint ( IPAddress . Loopback , ( ( IPEndPoint ) listener . LocalEndPoint ) . Port ) ) )
821+ . WaitAsync ( TestSettings . PassingTestTimeout ) ;
816822
817823 using ( Socket server = await acceptTask )
818824 {
0 commit comments