Commit: patch 9.2.0977: tests: test_terminal_visual_empty_listchars() is flaky
Christian Brabandt <[email protected]>
| Newsgroups | gmane.editors.vim.devel |
|---|---|
| Message-ID | <[email protected]> |
patch 9.2.0977: tests: test_terminal_visual_empty_listchars() is flaky Commit: https://github.com/vim/vim/commit/e3eb025930fc81a5c0921b08b5bdb01e88f82b25 Author: Hirohito Higashi <[email protected]> Date: Tue Aug 18 21:43:29 2026 +0000 patch 9.2.0977: tests: test_terminal_visual_empty_listchars() is flaky Problem: tests: test_terminal_visual_empty_listchars() is flaky Solution: Use WaitForAssert (Hirohito Higashi). related: #21093 Co-Authored-By: Claude Opus 5 (1M context) <[email protected]> Signed-off-by: Hirohito Higashi <[email protected]> Signed-off-by: Christian Brabandt <[email protected]> diff --git a/src/testdir/test_terminal3.vim b/src/testdir/test_terminal3.vim index cf87038ef..67952bfb6 100644 --- a/src/testdir/test_terminal3.vim +++ b/src/testdir/test_terminal3.vim @@ -1028,12 +1028,16 @@ func Test_terminal_visual_empty_listchars() \ ] call writefile(lines, 'XtermStart1', 'D') let buf = RunVimInTerminal('-S XtermStart1', #{rows: 15}) - call term_wait(buf) + " Wait for the job to finish, otherwise the keys go to the shell. + call WaitForAssert({-> assert_match('\[finished\]', term_getline(buf, 7))}) call term_sendkeys(buf, "V2k") + call term_wait(buf) call VerifyScreenDump(buf, 'Test_terminal_empty_listchars', {}) call term_sendkeys(buf, "\<esc>") call term_sendkeys(buf, ":set nu\<cr>") + call term_wait(buf) call term_sendkeys(buf, "ggV2j") + call term_wait(buf) call VerifyScreenDump(buf, 'Test_terminal_empty_listchars2', {}) call StopVimInTerminal(buf) @@ -1051,7 +1055,7 @@ func Test_terminal_normal_mode_colored_empty_line() \ 'Xterm_colored.sh', 'D') call writefile([':term sh ./Xterm_colored.sh'], 'XtermColored', 'D') let buf = RunVimInTerminal('-S XtermColored', #{rows: 10}) - call term_wait(buf) + call WaitForAssert({-> assert_match('\[finished\]', term_getline(buf, 5))}) call VerifyScreenDump(buf, 'Test_terminal_colored_empty_1', {}) " Enter Terminal-Normal mode: the empty lines must still be gray. @@ -1075,7 +1079,7 @@ func Test_terminal_visual_colored_empty_line() call writefile([':set listchars=', ':term sh ./Xterm_colored.sh'], \ 'XtermColored', 'D') let buf = RunVimInTerminal('-S XtermColored', #{rows: 10}) - call term_wait(buf) + call WaitForAssert({-> assert_match('\[finished\]', term_getline(buf, 5))}) call term_sendkeys(buf, "\<C-W>NggVG") call term_wait(buf) diff --git a/src/version.c b/src/version.c index 7b88e90e5..2bea460a9 100644 --- a/src/version.c +++ b/src/version.c @@ -763,6 +763,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 977, /**/ 976, /**/ -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion visit https://groups.google.com/d/msgid/vim_dev/E1wwlke-00CJqg-P4%40256bit.org.