[PATCH] ntdll/tests: Fix failures in the file tests [v2]

Detlef Riekenberg wine.dev at web.de
Tue Apr 2 14:17:13 CDT 2019


v2:
Removed the test for GetLastError() on success

Example test failure:
http://test.winehq.org/data/c6ff0e01224e86c7baa31d019fcb0a7bf03e2f96/win10_dr-i7-HD3000-wowv3/ntdll:file.html

Patch tested:
https://testbot.winehq.org/JobDetails.pl?Key=50393


--
bye bye ...
        ... Detlef

Signed-off-by: Detlef Riekenberg <wine.dev at web.de>
---
 dlls/ntdll/tests/file.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index d107c2ed2b..ce1619e4e1 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -4463,8 +4463,7 @@ static void test_read_write(void)
         bytes = 0xdeadbeef;
         SetLastError(0xdeadbeef);
         ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE);
-        ok(ret, "GetOverlappedResult should report TRUE\n");
-        ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError());
+        ok(ret, "GetOverlappedResult returned FALSE with %u (expected TRUE)\n", GetLastError());
         ok(bytes == 0, "expected 0, read %u\n", bytes);
         ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal);
         ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh);
@@ -4492,8 +4491,7 @@ static void test_read_write(void)
         bytes = 0xdeadbeef;
         SetLastError(0xdeadbeef);
         ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE);
-        ok(ret, "GetOverlappedResult should report TRUE\n");
-        ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError());
+        ok(ret, "GetOverlappedResult returned FALSE with %u (expected TRUE)\n", GetLastError());
         ok(bytes == 0, "expected 0, read %u\n", bytes);
         ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal);
         ok(ovl.InternalHigh == 0, "expected 0, got %lu\n", ovl.InternalHigh);
--
2.21.0.windows.1




More information about the wine-devel mailing list