未验证 提交 06cf0b02 编写于 作者: T Tom Deseyn 提交者: GitHub

Sockets.tests: TcpReceiveSendGetsCanceledByDispose: remove Timeout. (#52599)

* Sockets.tests: TcpReceiveSendGetsCanceledByDispose: remove Timeout.

This timeout is not needed and masks a more useful exception thrown
by the test.

* Add WaitAsync to timeout on all async operations

* Add missing timeout
上级 86719086
......@@ -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<byte>(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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册