[PATCH] ws2_32/tests: Fix an intermittent test failure on w10pro64.

[Zebediah Figura]

Much like 2aebe0b628.

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
 dlls/ws2_32/tests/sock.c | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 0b10b1bdb37..e8aea522185 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -3610,28 +3610,31 @@ static void test_select(void)
     ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n");
     ret = recv(fdWrite, tmp_buf, sizeof(tmp_buf), 0);
     ok(ret == 0, "expected 0, got %d\n", ret);
-
-    /* When a connection is attempted to a non-listening socket it will get to the except descriptor */
     ret = closesocket(fdWrite);
     ok(ret == 0, "expected 0, got %d\n", ret);
     ret = closesocket(fdListen);
     ok(ret == 0, "expected 0, got %d\n", ret);
-    len = sizeof(address);
-    fdWrite = setup_connector_socket(&address, len, TRUE);
-    FD_ZERO_ALL();
-    FD_SET(fdWrite, &writefds);
-    FD_SET(fdWrite, &exceptfds);
-    select_timeout.tv_sec = 2; /* requires more time to realize it will not connect */
-    ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout);
-    ok(ret == 1, "expected 1, got %d\n", ret);
-    len = sizeof(id);
-    id = 0xdeadbeef;
-    ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len);
-    ok(!ret, "getsockopt failed with %d\n", WSAGetLastError());
-    ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id);
-    ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n");
-    ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n");
-    closesocket(fdWrite);
+
+    /* w10pro64 sometimes takes over 2 seconds for an error to be reported. */
+    if (winetest_interactive)
+    {
+        len = sizeof(address);
+        fdWrite = setup_connector_socket(&address, len, TRUE);
+        FD_ZERO_ALL();
+        FD_SET(fdWrite, &writefds);
+        FD_SET(fdWrite, &exceptfds);
+        select_timeout.tv_sec = 10;
+        ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout);
+        ok(ret == 1, "expected 1, got %d\n", ret);
+        len = sizeof(id);
+        id = 0xdeadbeef;
+        ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len);
+        ok(!ret, "getsockopt failed with %d\n", WSAGetLastError());
+        ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id);
+        ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n");
+        ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n");
+        closesocket(fdWrite);
+    }
 
     /* Try select() on a closed socket after connection */
     tcp_socketpair(&fdRead, &fdWrite);
-- 
2.28.0

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=80532

Your paranoid android.


=== debiant (32 bit WoW report) ===

ws2_32:
sock.c:2852: Test succeeded inside todo block: Test[1]: expected 0, got 0