Mercurial > vim
changeset 21267:7833afe1c66e v8.2.1184
patch 8.2.1184: some tests fail
Commit: https://github.com/vim/vim/commit/2b6ef856fb89f703714f3f1f567d9bd7c81079f3
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jul 11 22:25:57 2020 +0200
patch 8.2.1184: some tests fail
Problem: Some tests fail.
Solution: Adjust tests for different assert_fails() behavior. Remove unused
variable.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 11 Jul 2020 22:30:08 +0200 |
parents | 4be9fc44d659 |
children | e02d7e2eb3dc |
files | src/evalvars.c src/testdir/test_assert.vim src/testdir/test_eval_stuff.vim src/version.c |
diffstat | 4 files changed, 10 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalvars.c +++ b/src/evalvars.c @@ -3389,7 +3389,6 @@ static char_u *redir_varname = NULL; var_redir_start(char_u *name, int append) { int called_emsg_before; - int err; typval_T tv; // Catch a bad name early.
--- a/src/testdir/test_assert.vim +++ b/src/testdir/test_assert.vim @@ -208,12 +208,12 @@ func Test_notmatch() endfunc func Test_assert_fail_fails() - call assert_equal(1, assert_fails('xxx', {})) - call assert_match("Expected {} but got 'E731:", v:errors[0]) + call assert_equal(1, assert_fails('xxx', 'E12345')) + call assert_match("Expected 'E12345' but got 'E492:", v:errors[0]) call remove(v:errors, 0) - call assert_equal(1, assert_fails('xxx', {}, 'stupid')) - call assert_match("stupid: Expected {} but got 'E731:", v:errors[0]) + call assert_equal(1, assert_fails('xxx', 'E9876', 'stupid')) + call assert_match("stupid: Expected 'E9876' but got 'E492:", v:errors[0]) call remove(v:errors, 0) call assert_equal(1, assert_fails('echo', '', 'echo command'))
--- a/src/testdir/test_eval_stuff.vim +++ b/src/testdir/test_eval_stuff.vim @@ -1,5 +1,7 @@ " Tests for various eval things. +source view_util.vim + function s:foo() abort try return [] == 0 @@ -17,13 +19,8 @@ func Test_nocatch_restore_silent_emsg() throw 1 catch endtry - echoerr 'wrong' - let c1 = nr2char(screenchar(&lines, 1)) - let c2 = nr2char(screenchar(&lines, 2)) - let c3 = nr2char(screenchar(&lines, 3)) - let c4 = nr2char(screenchar(&lines, 4)) - let c5 = nr2char(screenchar(&lines, 5)) - call assert_equal('wrong', c1 . c2 . c3 . c4 . c5) + echoerr 'wrong again' + call assert_equal('wrong again', ScreenLine(&lines)) endfunc func Test_mkdir_p()