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 053bc0a2feec22813ae83ce75ff41ff4806197b6..4d43977fa2b3cf364874d93d3935b1f3ecdb737a 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive/SendReceive.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive/SendReceive.cs @@ -952,7 +952,8 @@ public async Task UdpReceiveGetsCanceledByDispose(IPAddress address) 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; @@ -996,7 +997,7 @@ public async Task UdpReceiveGetsCanceledByDispose(IPAddress address) { 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) @@ -1028,7 +1029,9 @@ public async Task TcpReceiveSendGetsCanceledByDispose(bool receiveOrSend, bool i var buffer = new ArraySegment(new byte[4096]); while (true) { - SendAsync(socket1, buffer).GetAwaiter().GetResult(); + SendAsync(socket1, buffer) + .WaitAsync(TimeSpan.FromMilliseconds(TestSettings.PassingTestTimeout)) + .GetAwaiter().GetResult(); } }); } @@ -1038,14 +1041,17 @@ public async Task TcpReceiveSendGetsCanceledByDispose(bool receiveOrSend, bool i 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) { @@ -1080,7 +1086,8 @@ public async Task TcpReceiveSendGetsCanceledByDispose(bool receiveOrSend, bool i { try { - int received = await ReceiveAsync(socket2, receiveBuffer); + int received = await ReceiveAsync(socket2, receiveBuffer) + .WaitAsync(TimeSpan.FromMilliseconds(TestSettings.PassingTestTimeout)); if (received == 0) { break;