From ecdd14a427108aa6f133c00655788f6ae80ad463 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 11 Jul 2020 22:49:59 +0200
Subject: [PATCH] patch 8.2.1185: some other tests fail
Problem: Some other tests fail.
Solution: Adjust tests for different assert_fails() behavior.
---
src/testdir/test_lua.vim | 4 ++--
src/testdir/test_tcl.vim | 13 +++++++------
src/version.c | 2 ++
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/testdir/test_lua.vim b/src/testdir/test_lua.vim
index 38ff87205c..136649eac9 100644
--- a/src/testdir/test_lua.vim
+++ b/src/testdir/test_lua.vim
@@ -184,7 +184,7 @@ func Test_lua_call()
call assert_fails("call luaeval('vim.call(\"type\", co)')",
\ '[string "luaeval"]:1: lua: cannot convert value')
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
" Test vim.fn.*
@@ -637,7 +637,7 @@ func Test_lua_funcref()
call assert_fails('lua f1 = vim.funcref(fname)',
\ "[string \"vim chunk\"]:1: bad argument #1 to 'funcref' (string expected, got nil)")
call assert_fails('lua vim.funcref("abc")()',
- \ '[string "vim chunk"]:1: cannot call funcref')
+ \ ['E117:', '\[string "vim chunk"]:1: cannot call funcref'])
" dict funcref
function Mylen() dict
diff --git a/src/testdir/test_tcl.vim b/src/testdir/test_tcl.vim
index d6b03eba6f..b851ce8618 100644
--- a/src/testdir/test_tcl.vim
+++ b/src/testdir/test_tcl.vim
@@ -27,7 +27,8 @@ func Test_tcldo()
" Try to run a command in a 'nomodifiable' buffer
call setline(1, ['one', 'two', 'three'])
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
%bwipe!
@@ -449,7 +450,7 @@ func Test_buffer_delete()
" Try to delete lines from an 'nomodifiable' buffer
set nomodifiable
call assert_fails('tcl $::vim::current(buffer) delete 2 1',
- \ 'cannot save undo information')
+ \ ['E21:', 'cannot save undo information'])
set modifiable
bwipe!
@@ -495,7 +496,7 @@ func Test_buffer_append()
" Try to append lines to a 'nomodifiable' buffer
set nomodifiable
call assert_fails('tcl $buf append 1 "first"',
- \ 'cannot save undo information')
+ \ ['E21:', 'cannot save undo information'])
set modifiable
tcl unset buf
@@ -531,11 +532,11 @@ func Test_buffer_set()
" Try to modify a 'nomodifiable' buffer
set nomodifiable
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}',
- \ 'cannot save undo information')
+ \ ['E21:', 'cannot save undo information'])
call assert_fails('tcl $::vim::current(buffer) set 1 2 {a b}',
- \ 'cannot save undo information')
+ \ ['E21:', 'cannot save undo information'])
set modifiable
bwipe!
endfunc
diff --git a/src/version.c b/src/version.c
index 7c3ee485f4..42668c7277 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1185,
/**/
1184,
/**/
--
GitLab