[PATCH v2] user32/tests: Update 1 todo_wine message in msg.

[Serge Gautherie]

Signed-off-by: Serge Gautherie 
---
For the record, debian10 and debiant results:
https://testbot.winehq.org/JobDetails.pl?Key=67492
---
 dlls/user32/tests/msg.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 303a026..adca844 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -2396,9 +2396,8 @@ static void dump_sequence(const struct message *expected, const char *context, c
     }
 }

-#define ok_sequence( exp, contx, todo) \
-        ok_sequence_( (exp), (contx), (todo), __FILE__, __LINE__)
-
+#define ok_sequence(exp, contx, todo) \
+    ok_sequence_(exp, contx, todo, __FILE__, __LINE__)

static void ok_sequence_(const struct message *expected_list, const char *context, BOOL todo,
                          const char *file, int line)
@@ -2571,10 +2570,11 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
                               context, count, expected->message, actual->message);
         }
     }
+
     if( todo && !failcount) /* succeeded yet marked todo */
         todo_wine {
             if (!strcmp(winetest_platform, "wine")) dump++;
-            ok_( file, line)( TRUE, "%s: marked "todo_wine" but succeeds\n", context);
+            ok_(file, line)(TRUE, "%s, (line %d)\n", context, __LINE__);
         }

done:
@@ -5153,7 +5153,7 @@ static void test_messages(void)

ShowWindow(hwnd, SW_MINIMIZE);
     flush_events();
-    ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE);
+    ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped [Not fixed, though ok on TestBot]", TRUE);
     flush_sequence();

if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE)

[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=67571

Your paranoid android.

=== w1064v1809_ar (32 bit report) ===

user32:
msg: Timeout

=== w1064v1809_ar (testbot log) ===

The task timed out

=== w1064v1809_zh_CN (32 bit report) ===

user32:
msg.c:11391: Test failed: SendMessageTimeout succeeded
msg.c:11392: Test failed: WmEmptySeq: 0: the msg sequence is not complete: expected 0000 - actual 0400

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

user32:
msg.c:5156: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped [Not fixed, though ok on TestBot], (line 2577)

=== debiant (32 bit French report) ===

user32:
msg.c:5156: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped [Not fixed, though ok on TestBot], (line 2577)

=== debiant (32 bit Japanese:Japan report) ===

user32:
msg.c:5156: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped [Not fixed, though ok on TestBot], (line 2577)

=== debiant (32 bit Chinese:China report) ===

user32:
msg.c:5156: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped [Not fixed, though ok on TestBot], (line 2577)

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

user32:
msg.c:5156: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped [Not fixed, though ok on TestBot], (line 2577)

=== debiant (64 bit WoW report) ===

user32:
msg.c:5156: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped [Not fixed, though ok on TestBot], (line 2577)

[Serge Gautherie]

Not caused by my patch.
I don't know why timeout and error happen,
but they can't be caused by simply modifying text, which works correctly.

On 19/03/2020 17:11, Marvin wrote:
> 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=67571
>
> Your paranoid android.
>
> === w1064v1809_ar (32 bit report) ===
>
> user32:
> msg: Timeout
>
> === w1064v1809_ar (testbot log) ===
>
> The task timed out
>
> === w1064v1809_zh_CN (32 bit report) ===
>
> user32:
> msg.c:11391: Test failed: SendMessageTimeout succeeded
> msg.c:11392: Test failed: WmEmptySeq: 0: the msg sequence is not complete: expected 0000 - actual 0400
>
> === debiant (32 bit report) ===
>
> user32:
> msg.c:5156: Test succeeded inside todo block: ShowWindow(SW_SHOWMINIMIZED):overlapped [Not fixed, though ok on TestBot], (line 2577)

[Zebediah Figura]

On 3/19/20 10:22 AM, Serge Gautherie wrote:
> Signed-off-by: Serge Gautherie
>
> For the record, debian10 and debiant results:
> https://testbot.winehq.org/JobDetails.pl?Key=67492
>
> dlls/user32/tests/msg.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
> index 303a026..adca844 100644
> --- a/dlls/user32/tests/msg.c
> +++ b/dlls/user32/tests/msg.c
> @@ -2396,9 +2396,8 @@ static void dump_sequence(const struct message *expected, const char *context, c
>      }
>  }
>
> -#define ok_sequence( exp, contx, todo) \
> -
>    ok_sequence_( (exp), (contx), (todo), __FILE__, __LINE__)
> -
>
> +#define ok_sequence(exp, contx, todo) \
> - ok_sequence_(exp, contx, todo, __FILE__, __LINE__)
>
> static void ok_sequence_(const struct message *expected_list, const char *context, BOOL todo,
>                           const char *file, int line)
> @@ -2571,10 +2570,11 @@ static void ok_sequence_(const struct message *expected_list, const char *contex
>                                context, count, expected->message, actual->message);
>          }
>      }
> - if( todo && !failcount) /* succeeded yet marked todo */
>        todo_wine {
>            if (!strcmp(winetest_platform, "wine")) dump++;
> -
>        ok_( file, line)( TRUE, "%s: marked \"todo_wine\" but succeeds\n", context);
> -
>        ok_(file, line)(TRUE, "%s, (line %d)\n", context, __LINE__);
>    }
>
> done:

You probably should try to avoid these stray whitespace changes; they're
pointless and unrelated to the subject of the patch.
> @@ -5153,7 +5153,7 @@ static void test_messages(void)
>  ShowWindow(hwnd, SW_MINIMIZE);
>  flush_events();
> - ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE);
> -
>
> ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped [Not fixed, though ok on TestBot]", TRUE);
> flush_sequence();
>
> if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE)

I'm not sure that I see the value of this.