aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-01 04:54:07 -04:00
Code Activity

patch 8.2.1185: some other tests fail

Browse Source 
Problem:    Some other tests fail.
Solution:   Adjust tests for different assert_fails() behavior.
This commit is contained in:
Bram Moolenaar
2020-07-11 22:49:59 +02:00
parent 2b6ef856fb
commit ecdd14a427
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/testdir/test_lua.vim
View File

@@ -184,7 +184,7 @@ func Test_lua_call()
call assert_fails("call luaeval('vim.call(\"type\", co)')", call assert_fails("call luaeval('vim.call(\"type\", co)')",
\ '[string "luaeval"]:1: lua: cannot convert value') \ '[string "luaeval"]:1: lua: cannot convert value')
lua co = nil lua co = nil
call assert_fails("call luaeval('vim.call(\"abc\")')", '[string "luaeval"]:1: lua: call_vim_function failed') call assert_fails("call luaeval('vim.call(\"abc\")')", ['E117:', '\[string "luaeval"]:1: lua: call_vim_function failed'])
endfunc endfunc
" Test vim.fn.* " Test vim.fn.*
@@ -637,7 +637,7 @@ func Test_lua_funcref()
call assert_fails('lua f1 = vim.funcref(fname)', call assert_fails('lua f1 = vim.funcref(fname)',
\ "[string \"vim chunk\"]:1: bad argument #1 to 'funcref' (string expected, got nil)") \ "[string \"vim chunk\"]:1: bad argument #1 to 'funcref' (string expected, got nil)")
call assert_fails('lua vim.funcref("abc")()', call assert_fails('lua vim.funcref("abc")()',
\ '[string "vim chunk"]:1: cannot call funcref') \ ['E117:', '\[string "vim chunk"]:1: cannot call funcref'])
" dict funcref " dict funcref
function Mylen() dict function Mylen() dict

13
src/testdir/test_tcl.vim
View File

@@ -27,7 +27,8 @@ func Test_tcldo()
" Try to run a command in a 'nomodifiable' buffer " Try to run a command in a 'nomodifiable' buffer
call setline(1, ['one', 'two', 'three']) call setline(1, ['one', 'two', 'three'])
set nomodifiable set nomodifiable
call assert_fails('tcldo set line "abc"', 'cannot save undo information') call assert_fails('tcldo set line "abc"',
\ ['E21:', 'cannot save undo information'])
set modifiable set modifiable
%bwipe! %bwipe!
@@ -449,7 +450,7 @@ func Test_buffer_delete()
" Try to delete lines from an 'nomodifiable' buffer " Try to delete lines from an 'nomodifiable' buffer
set nomodifiable set nomodifiable
call assert_fails('tcl $::vim::current(buffer) delete 2 1', call assert_fails('tcl $::vim::current(buffer) delete 2 1',
\ 'cannot save undo information') \ ['E21:', 'cannot save undo information'])
set modifiable set modifiable
bwipe! bwipe!
@@ -495,7 +496,7 @@ func Test_buffer_append()
" Try to append lines to a 'nomodifiable' buffer " Try to append lines to a 'nomodifiable' buffer
set nomodifiable set nomodifiable
call assert_fails('tcl $buf append 1 "first"', call assert_fails('tcl $buf append 1 "first"',
\ 'cannot save undo information') \ ['E21:', 'cannot save undo information'])
set modifiable set modifiable
tcl unset buf tcl unset buf
@@ -531,11 +532,11 @@ func Test_buffer_set()
" Try to modify a 'nomodifiable' buffer " Try to modify a 'nomodifiable' buffer
set nomodifiable set nomodifiable
call assert_fails('tcl $::vim::current(buffer) set 1 "x"', call assert_fails('tcl $::vim::current(buffer) set 1 "x"',
\ 'cannot save undo information') \ ['E21:', 'cannot save undo information'])
call assert_fails('tcl $::vim::current(buffer) set 1 {a b}', call assert_fails('tcl $::vim::current(buffer) set 1 {a b}',
\ 'cannot save undo information') \ ['E21:', 'cannot save undo information'])
call assert_fails('tcl $::vim::current(buffer) set 1 2 {a b}', call assert_fails('tcl $::vim::current(buffer) set 1 2 {a b}',
\ 'cannot save undo information') \ ['E21:', 'cannot save undo information'])
set modifiable set modifiable
bwipe! bwipe!
endfunc endfunc

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1185,
/**/ /**/
1184, 1184,
/**/ /**/