[PATCH 0/1] MR2646: advapi32/tests: Make the services resume handle traces more informative.

[Francois Gouget (＠fgouget)]

---
One of them fails from time to time which is most likely a 'service
stop race condition'.

[PATCH 1/1] advapi32/tests: Make the services resume handle traces more informative.

[Francois Gouget]

From: Francois Gouget

---
One of them fails from time to time which is most likely a 'service
stop race condition'.
---
 dlls/advapi32/tests/service.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c
index da8495da45f..8cc737207e0 100644
--- a/dlls/advapi32/tests/service.c
+++ b/dlls/advapi32/tests/service.c
@@ -1350,9 +1350,9 @@ static BOOL test_enum_svc(int attempt)
         goto retry; /* service stop race condition */
     }
     ok(!ret, "Expected failure\n");
-    ok(needed != 0xdeadbeef && needed > 0, "Expected the needed buffer size for the missing services\n");
-    todo_wine ok(needed < tempneeded, "Expected a smaller needed buffer size for the missing services\n");
-    ok(returned < tempreturned, "Expected fewer services to be returned\n");
+    ok(needed != 0xdeadbeef && needed > 0, "Expected the needed buffer size for the missing services, got %lx\n", needed);
+    todo_wine ok(needed < tempneeded, "Expected < %lu bytes needed for the remaining services, got %lu\n", tempneeded, needed);
+    ok(returned < tempreturned, "Expected < %lu remaining services, got %lu\n", tempreturned, returned);
     todo_wine ok(resume, "Expected a resume handle\n");
     ok(GetLastError() == ERROR_MORE_DATA,
        "Expected ERROR_MORE_DATA, got %ld\n", GetLastError());
@@ -1369,8 +1369,8 @@ static BOOL test_enum_svc(int attempt)
     if (!ret && GetLastError() == ERROR_MORE_DATA && attempt)
         goto retry; /* service start race condition */
     ok(ret, "Expected success, got error %lu\n", GetLastError());
-    ok(needed == 0, "Expected needed buffer to be 0 as we are done\n");
-    todo_wine ok(returned == missing, "Expected %lu services to be returned\n", missing);
+    ok(needed == 0, "Expected 0 needed bytes as we are done, got %lu\n", needed);
+    todo_wine ok(returned == missing, "Expected %lu remaining services, got %lu\n", missing, returned);
     ok(resume == 0, "Expected the resume handle to be 0\n");

/* See if things add up */

[Francois Gouget (＠fgouget)]

The kernel32:heap failure is a known issue:
https://bugs.winehq.org//show_bug.cgi?id=54498