averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-11 15:37:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

patch 9.2.0401: tests: still a few flaky tests

Browse Source 
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 <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2026-04-27 17:41:45 +00:00
parent dd9b31fb62
commit 0bc64b19a2
5 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/testdir/dumps/Test_tabpanel_drawing_2_0.dump
Generated
+10 -10
View File
@@ -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
src/testdir/dumps/Test_tabpanel_drawing_2_1.dump
Generated
+10 -10
View File
@@ -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|
src/testdir/test_messages.vim
+3 -1
View File
@@ -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', {})
src/testdir/test_tabpanel.vim
+1 -1
View File
@@ -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', {})
src/version.c
+2
View File
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
401,
/**/
400,
/**/