Commit: patch 9.2.0401: tests: still a few flaky tests

[Christian Brabandt]

patch 9.2.0401: tests: still a few flaky tests

Commit: https://github.com/vim/vim/commit/0bc64b19a2e14a51c5a5ee162d7047c53fc30f9c
Author: Christian Brabandt <c...@256bit.org>
Date: Mon Apr 27 17:41:45 2026 +0000

patch 9.2.0401: tests: still a few flaky tests

Problem: tests: still a few flaky tests
Solution: Add WaitForAssert to test_messages.vim, use a smaller terminal
window for test_tabpanel, add TermWait() in test_messages
to handle DECQRM messages.

closes: #20074

Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/testdir/dumps/Test_tabpanel_drawing_2_0.dump b/src/testdir/dumps/Test_tabpanel_drawing_2_0.dump
index 23fe3c8e4..c6d034efb 100644
--- a/src/testdir/dumps/Test_tabpanel_drawing_2_0.dump
+++ b/src/testdir/dumps/Test_tabpanel_drawing_2_0.dump
@@ -1,10 +1,10 @@
-| +0&#ffffff0@57||+1&&|++2&&| |[|N|o| |N|a|m|e|]| @7
-> +0&&@57||+1&&| @18
-|a+0&&@2| @54||+1&&| @18
-|~+0#4040ff13&| @56||+1#0000000&| @18
-|~+0#4040ff13&| @56||+1#0000000&| @18
-|~+0#4040ff13&| @56||+1#0000000&| @18
-|~+0#4040ff13&| @56||+1#0000000&| @18
-|~+0#4040ff13&| @56||+1#0000000&| @18
-|~+0#4040ff13&| @56||+1#0000000&| @18
-|-+2&&@1| |I|N|S|E|R|T| |-@1| +0&&@27|2|,|1| @10|A|l@1| ||+1&&| @18
+| +0&#ffffff0@44||+1&&|++2&&| |[|N|o| |N|a|m|e|]| @7
+> +0&&@44||+1&&| @18
+|a+0&&@2| @41||+1&&| @18
+|~+0#4040ff13&| @43||+1#0000000&| @18
+|~+0#4040ff13&| @43||+1#0000000&| @18
+|~+0#4040ff13&| @43||+1#0000000&| @18
+|~+0#4040ff13&| @43||+1#0000000&| @18
+|~+0#4040ff13&| @43||+1#0000000&| @18
+|~+0#4040ff13&| @43||+1#0000000&| @18
+|-+2&&@1| |I|N|S|E|R|T| |-@1| +0&&@14|2|,|1| @10|A|l@1| ||+1&&| @18
diff --git a/src/testdir/dumps/Test_tabpanel_drawing_2_1.dump b/src/testdir/dumps/Test_tabpanel_drawing_2_1.dump
index d82adb29a..92276717e 100644
--- a/src/testdir/dumps/Test_tabpanel_drawing_2_1.dump
+++ b/src/testdir/dumps/Test_tabpanel_drawing_2_1.dump
@@ -1,10 +1,10 @@
-|++2&#ffffff0| |[|N|o| |N|a|m|e|]| @7||+1&&| +0&&@57
-| +1&&@18||> +0&&@57
-| +1&&@18|||a+0&&@2| @54
-| +1&&@18|||~+0#4040ff13&| @56
-| +1#0000000&@18|||~+0#4040ff13&| @56
-| +1#0000000&@18|||~+0#4040ff13&| @56
-| +1#0000000&@18|||~+0#4040ff13&| @56
-| +1#0000000&@18|||~+0#4040ff13&| @56
-| +1#0000000&@18|||~+0#4040ff13&| @56
-| +1#0000000&@18|||-+2&&@1| |I|N|S|E|R|T| |-@1| +0&&@27|2|,|1| @10|A|l@1|
+|++2&#ffffff0| |[|N|o| |N|a|m|e|]| @7||+1&&| +0&&@44
+| +1&&@18||> +0&&@44
+| +1&&@18|||a+0&&@2| @41
+| +1&&@18|||~+0#4040ff13&| @43
+| +1#0000000&@18|||~+0#4040ff13&| @43
+| +1#0000000&@18|||~+0#4040ff13&| @43
+| +1#0000000&@18|||~+0#4040ff13&| @43
+| +1#0000000&@18|||~+0#4040ff13&| @43
+| +1#0000000&@18|||~+0#4040ff13&| @43
+| +1#0000000&@18|||-+2&&@1| |I|N|S|E|R|T| |-@1| +0&&@14|2|,|1| @10|A|l@1|
diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim
index 5fa84e954..80996cfad 100644
--- a/src/testdir/test_messages.vim
+++ b/src/testdir/test_messages.vim
@@ -439,7 +439,7 @@ func Test_mode_cleared_after_silent_message()
let buf = RunVimInTerminal('-S XsilentMessageMode', {'rows': 10})

call term_sendkeys(buf, 'v')
- call TermWait(buf)
+ call WaitForAssert({-> assert_match('VISUAL.*\d\+\s\+\d', term_getline(buf, 10))}, 1000)
call VerifyScreenDump(buf, 'Test_mode_cleared_after_silent_message_1', {})

call term_sendkeys(buf, 'd')
@@ -458,6 +458,8 @@ func Test_echo_verbose_system()
CheckNotMac " the macos TMPDIR is too long for snapshot testing

let buf = RunVimInTerminal('', {'rows': 10})
+ " give it some time to handle DECRQM response
+ call TermWait(buf, 50)
call term_sendkeys(buf, ":4 verbose echo system('seq 20')\<CR>")
" Note that the screendump is filtered to remove the name of the temp file
call VerifyScreenDump(buf, 'Test_verbose_system_1', {})
diff --git a/src/testdir/test_tabpanel.vim b/src/testdir/test_tabpanel.vim
index 0f6aa0b56..c510d078f 100644
--- a/src/testdir/test_tabpanel.vim
+++ b/src/testdir/test_tabpanel.vim
@@ -372,7 +372,7 @@ function Test_tabpanel_drawing_2()
END
call writefile(lines, 'XTest_tabpanel_drawing_2', 'D')

- let buf = RunVimInTerminal('-S XTest_tabpanel_drawing_2', {'rows': 10, 'cols': 78})
+ let buf = RunVimInTerminal('-S XTest_tabpanel_drawing_2', {'rows': 10, 'cols': 65})
call term_sendkeys(buf, "ggo")
call VerifyScreenDump(buf, 'Test_tabpanel_drawing_2_0', {})

diff --git a/src/version.c b/src/version.c
index 8dfe9b8f7..df55ec4d4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 401,
/**/
400,
/**/