Skip to content

SendRecv_Stream_TCP: also timeout send/receive, escape xunit sync context #90949

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
merged 1 commit into from
Aug 24, 2023
Merged

SendRecv_Stream_TCP: also timeout send/receive, escape xunit sync context #90949

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 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 @@ -67,7 +67,7 @@ public async Task SendRecv_Stream_TCP(IPAddress listenAt, bool useMultipleBuffer
var recvBuffer = new byte[256];
while (true)
{
int received = await ReceiveAsync(remote, new ArraySegment<byte>(recvBuffer));
int received = await ReceiveAsync(remote, new ArraySegment<byte>(recvBuffer)).WaitAsync(TestSettings.PassingTestTimeout);
if (received == 0)
{
break;
Expand All @@ -86,7 +86,7 @@ public async Task SendRecv_Stream_TCP(IPAddress listenAt, bool useMultipleBuffer
new ArraySegment<byte>(new byte[64], 9, 33)};
while (true)
{
int received = await ReceiveAsync(remote, recvBuffers);
int received = await ReceiveAsync(remote, recvBuffers).WaitAsync(TestSettings.PassingTestTimeout);
if (received == 0)
{
break;
Expand All @@ -109,7 +109,9 @@ public async Task SendRecv_Stream_TCP(IPAddress listenAt, bool useMultipleBuffer
EndPoint clientEndpoint = server.LocalEndPoint;
using (var client = new Socket(clientEndpoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp))
{
await ConnectAsync(client, clientEndpoint).WaitAsync(TestSettings.PassingTestTimeout);
await ConnectAsync(client, clientEndpoint)
.WaitAsync(TestSettings.PassingTestTimeout)
.ConfigureAwait(false);

var random = new Random();
if (!useMultipleBuffers)
Expand All @@ -118,7 +120,9 @@ public async Task SendRecv_Stream_TCP(IPAddress listenAt, bool useMultipleBuffer
for (int sent = 0, remaining = BytesToSend; remaining > 0; remaining -= sent)
{
random.NextBytes(sendBuffer);
sent = await SendAsync(client, new ArraySegment<byte>(sendBuffer, 0, Math.Min(sendBuffer.Length, remaining)));
sent = await SendAsync(client, new ArraySegment<byte>(sendBuffer, 0, Math.Min(sendBuffer.Length, remaining)))
.WaitAsync(TestSettings.PassingTestTimeout)
.ConfigureAwait(false);
bytesSent += sent;
sentChecksum.Add(sendBuffer, 0, sent);
}
Expand All @@ -137,7 +141,9 @@ public async Task SendRecv_Stream_TCP(IPAddress listenAt, bool useMultipleBuffer
random.NextBytes(sendBuffers[i].Array);
}

sent = await SendAsync(client, sendBuffers);
sent = await SendAsync(client, sendBuffers)
.WaitAsync(TestSettings.PassingTestTimeout)
.ConfigureAwait(false);

bytesSent += sent;
for (int i = 0, remaining = sent; i < sendBuffers.Count && remaining > 0; i++)
Expand All @@ -152,7 +158,7 @@ public async Task SendRecv_Stream_TCP(IPAddress listenAt, bool useMultipleBuffer

client.LingerState = new LingerOption(true, LingerTime);
client.Shutdown(SocketShutdown.Send);
await serverProcessingTask.WaitAsync(TestSettings.PassingTestTimeout);
await serverProcessingTask.WaitAsync(TestSettings.PassingTestTimeout).ConfigureAwait(false);
}

Assert.Equal(bytesSent, bytesReceived);
Expand Down