diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-09-22 20:18:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-22 20:18:06 +0800 |
| commit | a7f6f0e2ddf90f9c05838e72ffb8c60148b49109 (patch) | |
| tree | 856952f2398144ceada8a25a21eb955b6a39c6f4 | |
| parent | 7fc5f6605fb3de361c970a1d22a42a905a072a0c (diff) | |
| download | rneovim-a7f6f0e2ddf90f9c05838e72ffb8c60148b49109.tar.gz rneovim-a7f6f0e2ddf90f9c05838e72ffb8c60148b49109.tar.bz2 rneovim-a7f6f0e2ddf90f9c05838e72ffb8c60148b49109.zip | |
vim-patch:9.0.0539: long message test can be flaky (#20282)
Problem: Long message test can be flaky.
Solution: Wait for more prompt instead of ruler.
https://github.com/vim/vim/commit/21d393a12be86126d9326ea0c244d3a101b77151
Comment N/A lines out instead of deleting in buftype tests.
| -rw-r--r-- | src/nvim/testdir/test_autocmd.vim | 4 | ||||
| -rw-r--r-- | src/nvim/testdir/test_functions.vim | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_messages.vim | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim index 3064b199d9..1be2d11034 100644 --- a/src/nvim/testdir/test_autocmd.vim +++ b/src/nvim/testdir/test_autocmd.vim @@ -533,7 +533,9 @@ func Test_BufReadCmdNofile() \ 'acwrite', \ 'quickfix', \ 'help', + "\ 'terminal', \ 'prompt', + "\ 'popup', \ ] new somefile exe 'set buftype=' .. val @@ -650,7 +652,9 @@ func Test_BufEnter() \ 'acwrite', \ 'quickfix', \ 'help', + "\ 'terminal', \ 'prompt', + "\ 'popup', \ ] new somefile exe 'set buftype=' .. val diff --git a/src/nvim/testdir/test_functions.vim b/src/nvim/testdir/test_functions.vim index 7262d2d71a..7ad0cb5884 100644 --- a/src/nvim/testdir/test_functions.vim +++ b/src/nvim/testdir/test_functions.vim @@ -1898,7 +1898,9 @@ func Test_bufadd_bufload() \ ['acwrite', 1], \ ['quickfix', 0], \ ['help', 1], + "\ ['terminal', 0], \ ['prompt', 0], + "\ ['popup', 0], \ ] bwipe! XotherName let buf = bufadd('XotherName') diff --git a/src/nvim/testdir/test_messages.vim b/src/nvim/testdir/test_messages.vim index 0f348c22cb..2672fcb69d 100644 --- a/src/nvim/testdir/test_messages.vim +++ b/src/nvim/testdir/test_messages.vim @@ -358,7 +358,8 @@ func Test_quit_long_message() echom range(9999)->join("\x01") END call writefile(content, 'Xtest_quit_message') - let buf = RunVimInTerminal('-S Xtest_quit_message', #{rows: 6}) + let buf = RunVimInTerminal('-S Xtest_quit_message', #{rows: 6, wait_for_ruler: 0}) + call WaitForAssert({-> assert_match('^-- More --', term_getline(buf, 6))}) call term_sendkeys(buf, "q") call VerifyScreenDump(buf, 'Test_quit_long_message', {}) |