[WS2_32_APITEST] Try to make the number of WSAAsync tests constant.

This commit is contained in:
Thomas Faber 2019-09-08 08:44:09 +02:00
parent 085528c31a
commit 06e886086c
No known key found for this signature in database
GPG key ID: 076E7C3D44720826

View file

@ -121,11 +121,10 @@ START_TEST(WSAAsync)
{ {
dwWait = WaitForMultipleObjects(2, fEvents, FALSE, WAIT_TIMEOUT_); dwWait = WaitForMultipleObjects(2, fEvents, FALSE, WAIT_TIMEOUT_);
ok(dwWait == WAIT_OBJECT_0 || // server socket event if (dwWait != WAIT_OBJECT_0 && // server socket event
dwWait == WAIT_OBJECT_0+1, // client socket event dwWait != WAIT_OBJECT_0+1) // client socket event
"Unknown event received %ld\n", dwWait);
if (dwWait != WAIT_OBJECT_0 && dwWait != WAIT_OBJECT_0+1)
{ {
ok(0, "Unknown event received %ld\n", dwWait);
skip("ERROR: Connection timeout\n"); skip("ERROR: Connection timeout\n");
break; break;
} }
@ -227,9 +226,12 @@ START_TEST(WSAAsync)
} }
else else
{ {
ok(nSockNameRes == 0, "ERROR: getsockname function failed, expected %d error %d\n", 0, nSockNameRes); if (nSockNameRes != 0)
ok(len == sizeof(addr_con_loc), "ERROR: getsockname function wrong size, expected %d returned %d\n", sizeof(addr_con_loc), len); ok(0, "ERROR: getsockname function failed, expected %d error %d\n", 0, nSockNameRes);
ok(addr_con_loc.sin_addr.s_addr == server_addr_in.sin_addr.s_addr, "ERROR: getsockname function wrong addr, expected %lx returned %lx\n", server_addr_in.sin_addr.s_addr, addr_con_loc.sin_addr.s_addr); if (len != sizeof(addr_con_loc))
ok(0, "ERROR: getsockname function wrong size, expected %d returned %d\n", sizeof(addr_con_loc), len);
if (addr_con_loc.sin_addr.s_addr != server_addr_in.sin_addr.s_addr)
ok(0, "ERROR: getsockname function wrong addr, expected %lx returned %lx\n", server_addr_in.sin_addr.s_addr, addr_con_loc.sin_addr.s_addr);
} }
if ((dwFlags & FD_ACCEPT) != 0) if ((dwFlags & FD_ACCEPT) != 0)
{// client connected {// client connected