Skip to content

Retry peer-reset timeouts in socket disposal tests on BSD/Apple #133371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MihaZupan merged 2 commits into from
Sep 8, 2026
Merged

Retry peer-reset timeouts in socket disposal tests on BSD/Apple #133371

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d870c75
Retry peer-reset timeouts in socket disposal tests on BSD/Apple
MihaZupan Sep 7, 2026
87c10f2
Enhance error handling for TimeoutException
MihaZupan Sep 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/libraries/System.Net.Sockets/tests/FunctionalTests/SendReceive/SendReceive.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,6 +1059,7 @@ await RetryHelper.ExecuteAsync(async () =>
(Socket socket1, Socket socket2) = SocketTestExtensions.CreateConnectedSocketPair(ipv6Server, dualModeClient);
using SafeSocketHandle? owner = ReplaceWithNonOwning(ref socket1, owning);

using (socket1)
using (socket2)
{
Task socketOperation;
Expand Down Expand Up @@ -1138,6 +1139,15 @@ await socketOperation
peerSocketError = se.SocketErrorCode;
break;
}
catch (TimeoutException ex) when (!receiveOrSend && (PlatformDetection.IsApplePlatform || PlatformDetection.IsFreeBSD))
{
// BSD TCP stacks may reject a valid reset when sent data has not yet
// been acknowledged. Retry with fresh sockets, not another receive.
const string Message = "Timed out waiting for the peer to observe the connection reset, retry.";
_output?.WriteLine(Message);
_output?.WriteLine(ex.ToString());
Assert.Fail(Message);
}
}

try
Expand Down
Loading