ws2_32/tests: Use todo_wine_if() in tests.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-02-17 02:11:01 +03:00 committed by Alexandre Julliard
parent 05e39f6af8
commit 944a0228f5
1 changed files with 4 additions and 23 deletions

View File

@ -1591,17 +1591,10 @@ todo_wine
"SO_PROTOCOL_INFO[A/W] comparison failed\n"); "SO_PROTOCOL_INFO[A/W] comparison failed\n");
/* Remove IF when WSAEnumProtocols support IPV6 data */ /* Remove IF when WSAEnumProtocols support IPV6 data */
if (prottest[i].family == AF_INET6) todo_wine_if (prottest[i].family == AF_INET6)
{
todo_wine
ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n", ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n",
prottest[i].family, infoA.iAddressFamily); prottest[i].family, infoA.iAddressFamily);
} ok(infoA.iSocketType == prottest[i].type, "socket type invalid, expected %d received %d\n",
else
{
ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n",
prottest[i].family, infoA.iAddressFamily);
} ok(infoA.iSocketType == prottest[i].type, "socket type invalid, expected %d received %d\n",
prottest[i].type, infoA.iSocketType); prottest[i].type, infoA.iSocketType);
ok(infoA.iProtocol == prottest[i].proto, "socket protocol invalid, expected %d received %d\n", ok(infoA.iProtocol == prottest[i].proto, "socket protocol invalid, expected %d received %d\n",
prottest[i].proto, infoA.iProtocol); prottest[i].proto, infoA.iProtocol);
@ -2798,25 +2791,13 @@ static void test_WSAEnumNetworkEvents(void)
"Test[%d]: WSAEnumNetworkEvents failed\n", i); "Test[%d]: WSAEnumNetworkEvents failed\n", i);
if (i >= 1 && j == 0) /* FD_WRITE is SET on first try for UDP and connected TCP */ if (i >= 1 && j == 0) /* FD_WRITE is SET on first try for UDP and connected TCP */
{ {
if (i == 0) /* Remove when fixed */ todo_wine_if (i == 0) /* Remove when fixed */
{
todo_wine
ok (net_events.lNetworkEvents == FD_WRITE, "Test[%d]: expected 2, got %d\n",
i, net_events.lNetworkEvents);
}
else
ok (net_events.lNetworkEvents == FD_WRITE, "Test[%d]: expected 2, got %d\n", ok (net_events.lNetworkEvents == FD_WRITE, "Test[%d]: expected 2, got %d\n",
i, net_events.lNetworkEvents); i, net_events.lNetworkEvents);
} }
else else
{ {
if (i != 0) /* Remove when fixed */ todo_wine_if (i != 0) /* Remove when fixed */
{
todo_wine
ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n",
i, net_events.lNetworkEvents);
}
else
ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n", ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n",
i, net_events.lNetworkEvents); i, net_events.lNetworkEvents);
} }