diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-11-05 07:24:06 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-11-05 12:27:45 +0800 |
| commit | 8b0c5de4e0964109326a0befb1b3bff6aac4d0db (patch) | |
| tree | 5cfde30567039d246c8b4fd960ccd2f07ed090fc /src/nvim/testdir/test_cmdline.vim | |
| parent | a86295cd5c2bf15a11eb05e226fd8e226154f6a6 (diff) | |
| download | rneovim-8b0c5de4e0964109326a0befb1b3bff6aac4d0db.tar.gz rneovim-8b0c5de4e0964109326a0befb1b3bff6aac4d0db.tar.bz2 rneovim-8b0c5de4e0964109326a0befb1b3bff6aac4d0db.zip | |
vim-patch:partial:8.2.1183: assert_fails() checks the last error message
Problem: assert_fails() checks the last error message.
Solution: Check the first error, it is more relevant. Fix all the tests
that rely on the old behavior.
https://github.com/vim/vim/commit/9b7bf9e98f06ece595fed7a3ff53ecce89797a53
Skip test_listener.vim, test_textprop.vim, test_viminfo.vim.
Skip test_python2.vim: affected line fails and hasn't been ported.
Skip test_python3.vim: affected lines fail and haven't been ported.
Skip CHECK_LIST_MATERIALIZE.
Co-authored-by: Bram Moolenaar <Bram@vim.org>
Diffstat (limited to 'src/nvim/testdir/test_cmdline.vim')
| -rw-r--r-- | src/nvim/testdir/test_cmdline.vim | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim index 3e5fe06c90..c00172ed68 100644 --- a/src/nvim/testdir/test_cmdline.vim +++ b/src/nvim/testdir/test_cmdline.vim @@ -1154,7 +1154,7 @@ func Test_cmdline_search_range() call assert_equal('B', getline(2)) let @/ = 'apple' - call assert_fails('\/print', 'E486:') + call assert_fails('\/print', ['E486:.*apple']) bwipe! endfunc @@ -1272,7 +1272,7 @@ func Test_verbosefile() call delete('Xlog') call mkdir('Xdir') if !has('win32') " FIXME: no error on Windows, libuv bug? - call assert_fails('set verbosefile=Xdir', 'E474:') + call assert_fails('set verbosefile=Xdir', ['E484:.*Xdir', 'E474:']) endif call delete('Xdir', 'd') endfunc @@ -1525,7 +1525,7 @@ func Test_cmdwin_jump_to_win() call assert_fails('call feedkeys("q:\<C-W>\<C-W>\<CR>", "xt")', 'E11:') new set modified - call assert_fails('call feedkeys("q/:qall\<CR>", "xt")', 'E162:') + call assert_fails('call feedkeys("q/:qall\<CR>", "xt")', ['E37:', 'E162:']) close! call feedkeys("q/:close\<CR>", "xt") call assert_equal(1, winnr('$')) @@ -1539,13 +1539,7 @@ endfunc func Test_cmdwin_tabpage() tabedit - " v8.2.1919 isn't ported yet, so E492 is thrown after E11 here. - " v8.2.1183 also isn't ported yet, so we also can't assert E11 directly. - " For now, assert E11 and E492 separately. When v8.2.1183 is ported, the - " assert for E492 will fail and this workaround should be removed. - " call assert_fails("silent norm q/g :I\<Esc>", 'E11:') - call assert_fails("silent norm q/g ", 'E11:') - call assert_fails("silent norm q/g :I\<Esc>", 'E492:') + call assert_fails("silent norm q/g :I\<Esc>", 'E11:') tabclose! endfunc |