[PATCH 0/2] MR3822: user32/tests: Account for ignored messages during wait.
From: Esme Povirk <esme(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53435 I prefer not to delete any tests, but I see no way to preserve this one while accounting for the possibility of an ignored message coming in during the 100 ms wait, and for the most part it seems redundant with other tests. --- dlls/user32/tests/msg.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c05982a9939..9ae772fc355 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -19688,11 +19688,6 @@ static void test_SendMessage_other_thread(int thread_n) /* intentionally yield */ MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); - ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); - /* FIXME: remove once Wine is fixed */ - todo_wine_if (thread_n == 2) - ok(ret == 0, "wrong status %08lx\n", ret); - if (winetest_debug > 1) trace("main: call PeekMessage\n"); ok(!PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should fail\n"); ok_sequence(WmEmptySeq, "SendMessage from other thread 5", thread_n == 2); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3822
From: Esme Povirk <esme(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53435 --- dlls/user32/tests/msg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9ae772fc355..c931ca6a983 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -19689,7 +19689,9 @@ static void test_SendMessage_other_thread(int thread_n) MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); if (winetest_debug > 1) trace("main: call PeekMessage\n"); - ok(!PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should fail\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) { + ok(ignore_message(msg.message), "got unexpected message %04x from PeekMessageA\n", msg.message); + } ok_sequence(WmEmptySeq, "SendMessage from other thread 5", thread_n == 2); ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3822
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 tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=137354 Your paranoid android. === w11pro64_amd (64 bit report) === user32: msg.c:5026: Test failed: ShowWindow(SW_SHOWNA) on visible top level window: 0: the msg 0x0018 was expected, but got msg 0x0088 instead
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. 3 TestBot errors prevented a full analysis of your patch. If the test caused the operating system (e.g. Windows) to crash or reboot you will probably have to modify it to avoid that. Other issues should be reported to the TestBot administrators. The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=151938 Your paranoid android. === build (build log) === WineRunBuild.pl:error: Could not copy the patch to the VM: network read timed out (sendfile/connect:AgentVersion.h:0/9) WineRunBuild.pl:error: BotError: The test VM has crashed, rebooted or lost connectivity (or the TestAgent server died) === debian11 (build log) === WineRunWineTest.pl:error: Could not send 'patch.diff' to the VM: network read timed out (sendfile/connect:AgentVersion.h:0/9) WineRunWineTest.pl:error: BotError: The test VM has crashed, rebooted or lost connectivity (or the TestAgent server died) WineRunWineTest.pl:error: Giving up after 3 run(s) === debian11b (build log) === WineRunWineTest.pl:error: Could not send 'patch.diff' to the VM: network read timed out (sendfile/connect:AgentVersion.h:0/9) WineRunWineTest.pl:error: BotError: The test VM has crashed, rebooted or lost connectivity (or the TestAgent server died) WineRunWineTest.pl:error: Giving up after 3 run(s)
participants (3)
-
Esme Povirk -
Esme Povirk (＠madewokherd)
-
Marvin