[PATCH 0/1] MR1974: rpcrt4/tests: Remove a failing test.

[Huw Davies (＠huw)]

A follow-up to !1807.

[PATCH 1/1] rpcrt4/tests: Remove a failing test.

[Huw Davies]

From: Huw Davies

---
 dlls/rpcrt4/tests/rpc.c | 42 ++++++++++++++---------------------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c
index a4653fd603f..2a3d43cfc2d 100644
--- a/dlls/rpcrt4/tests/rpc.c
+++ b/dlls/rpcrt4/tests/rpc.c
@@ -158,41 +158,27 @@ static void test_UuidFromString(void)
 static void test_DceErrorInqTextA(void)
 {
     char bufferInvalid [1024];
-    char buffer [1024]; /* The required size is not documented but would
-                         * appear to be 256.
-                         */
+    char buffer [1024];
     DWORD dwCount;
+    RPC_STATUS status;

dwCount = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
             RPC_S_NOT_RPC_ERROR, 0, bufferInvalid, ARRAY_SIZE(bufferInvalid), NULL);
+    ok(dwCount, "Cannot set up for DceErrorInqText\n");

-    /* A random sample of DceErrorInqText */
     /* 0 is success */
-    ok ((DceErrorInqTextA (0, (unsigned char*)buffer) == RPC_S_OK),
-            "DceErrorInqTextA(0...)\n");
-    /* A real RPC_S error */
-    ok ((DceErrorInqTextA (RPC_S_INVALID_STRING_UUID, (unsigned char*)buffer) == RPC_S_OK),
-            "DceErrorInqTextA(valid...)\n");
+    status = DceErrorInqTextA(0, (unsigned char*)buffer);
+    ok(status == RPC_S_OK, "got %lx\n", status);

-    if (dwCount)
-    {
-        /* A message for which FormatMessage should fail
-         * which should return RPC_S_OK and the 
-         * fixed "not valid" message
-         */
-        ok ((DceErrorInqTextA (35, (unsigned char*)buffer) == RPC_S_OK &&
-                    strcmp (buffer, bufferInvalid) == 0),
-                "DceErrorInqTextA(unformattable...)\n");
-        /* One for which FormatMessage should succeed but 
-         * DceErrorInqText should "fail"
-         * 3814 is generally quite a long message
-         */
-        ok ((DceErrorInqTextA (3814, (unsigned char*)buffer) == RPC_S_OK &&
-                    strcmp (buffer, bufferInvalid) == 0),
-                "DceErrorInqTextA(deviation...)\n");
-    }
-    else
-        ok (0, "Cannot set up for DceErrorInqText\n");
+    /* A real RPC_S error */
+    status = DceErrorInqTextA(RPC_S_INVALID_STRING_UUID, (unsigned char*)buffer);
+    ok(status == RPC_S_OK, "got %lx\n", status);
+
+    /* A message for which FormatMessage should fail which should return RPC_S_OK and the
+     * fixed "not valid" message  */
+    status = DceErrorInqTextA(35, (unsigned char*)buffer);
+    ok(status == RPC_S_OK, "got %lx\n", status);
+    ok(!strcmp(buffer, bufferInvalid), "got %s vs %s\n", wine_dbgstr_a(buffer), wine_dbgstr_a(bufferInvalid));
 }

static RPC_DISPATCH_FUNCTION IFoo_table[] =

[PATCH 1/1] rpcrt4/tests: Remove a failing test.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=128452

Your paranoid android.

=== w7u_2qxl (32 bit report) ===

rpcrt4:
rpc: Timeout

[PATCH 0/1] MR1974: rpcrt4/tests: Remove a failing test. - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.