diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive/SendReceive.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive/SendReceive.cs index 478951acd7770b..8b2e52a5128be8 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive/SendReceive.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive/SendReceive.cs @@ -950,7 +950,8 @@ await RetryHelper.ExecuteAsync(async () => msDelay *= 2; Task disposeTask = Task.Run(() => socket.Dispose()); - await Task.WhenAny(disposeTask, receiveTask).WaitAsync(TimeSpan.FromSeconds(30)); + await Task.WhenAny(disposeTask, receiveTask) + .WaitAsync(TimeSpan.FromMilliseconds(TestSettings.PassingTestTimeout)); await disposeTask; SocketError? localSocketError = null; @@ -994,7 +995,7 @@ await RetryHelper.ExecuteAsync(async () => { false, true, false }, }; - [Theory(Timeout = 40000)] + [Theory] [MemberData(nameof(TcpReceiveSendGetsCanceledByDispose_Data))] [ActiveIssue("https://github.com/dotnet/runtime/issues/50568", TestPlatforms.Android)] public async Task TcpReceiveSendGetsCanceledByDispose(bool receiveOrSend, bool ipv6Server, bool dualModeClient) @@ -1025,7 +1026,9 @@ await RetryHelper.ExecuteAsync(async () => var buffer = new ArraySegment(new byte[4096]); while (true) { - SendAsync(socket1, buffer).GetAwaiter().GetResult(); + SendAsync(socket1, buffer) + .WaitAsync(TimeSpan.FromMilliseconds(TestSettings.PassingTestTimeout)) + .GetAwaiter().GetResult(); } }); } @@ -1035,14 +1038,17 @@ await RetryHelper.ExecuteAsync(async () => msDelay *= 2; Task disposeTask = Task.Run(() => socket1.Dispose()); - await Task.WhenAny(disposeTask, socketOperation).WaitAsync(TimeSpan.FromSeconds(30)); - await disposeTask; + await Task.WhenAny(disposeTask, socketOperation) + .WaitAsync(TimeSpan.FromMilliseconds(TestSettings.PassingTestTimeout)); + await disposeTask + .WaitAsync(TimeSpan.FromMilliseconds(TestSettings.PassingTestTimeout)); SocketError? localSocketError = null; bool disposedException = false; try { - await socketOperation; + await socketOperation + .WaitAsync(TimeSpan.FromMilliseconds(TestSettings.PassingTestTimeout)); } catch (SocketException se) { @@ -1077,7 +1083,8 @@ await RetryHelper.ExecuteAsync(async () => { try { - int received = await ReceiveAsync(socket2, receiveBuffer); + int received = await ReceiveAsync(socket2, receiveBuffer) + .WaitAsync(TimeSpan.FromMilliseconds(TestSettings.PassingTestTimeout)); if (received == 0) { break;