Merge #8371 'API: more reliable/descriptive VimL errors'

3 files changed, 17 insertions, 11 deletions

diff --git a/test/functional/eval/buf_functions_spec.lua b/test/functional/eval/buf_functions_spec.lua
index 7de58766b9..c0e264d4c9 100644
--- a/test/functional/eval/buf_functions_spec.lua
+++ b/test/functional/eval/buf_functions_spec.lua
@@ -15,6 +15,7 @@ local curwinmeths = helpers.curwinmeths
 local curtabmeths = helpers.curtabmeths
 local get_pathsep = helpers.get_pathsep
 local rmdir = helpers.rmdir
+local expect_err = helpers.expect_err
 
 local fname = 'Xtest-functional-eval-buf_functions'
 local fname2 = fname .. '.2'
@@ -296,8 +297,8 @@ describe('setbufvar() function', function()
     eq('Vim(call):E461: Illegal variable name: b:',
        exc_exec('call setbufvar(1, "", 0)'))
     eq(true, bufmeths.get_var(buf1, 'number'))
-    funcs.setbufvar(1, 'changedtick', true)
-    -- eq(true, bufmeths.get_var(buf1, 'changedtick'))
+    expect_err('Vim:E46: Cannot change read%-only variable "b:changedtick"',
+               funcs.setbufvar, 1, 'changedtick', true)
     eq(2, funcs.getbufvar(1, 'changedtick'))
   end)
 end)
diff --git a/test/functional/eval/match_functions_spec.lua b/test/functional/eval/match_functions_spec.lua
index 7989b22b5e..0ec465a34c 100644
--- a/test/functional/eval/match_functions_spec.lua
+++ b/test/functional/eval/match_functions_spec.lua
@@ -6,6 +6,7 @@ local clear = helpers.clear
 local funcs = helpers.funcs
 local command = helpers.command
 local exc_exec = helpers.exc_exec
+local expect_err = helpers.expect_err
 
 before_each(clear)
 
@@ -40,9 +41,11 @@ describe('setmatches()', function()
   end)
 
   it('fails with -1 if highlight group is not defined', function()
-    eq(-1, funcs.setmatches({{group=1, pattern=2, id=3, priority=4}}))
+    expect_err('E28: No such highlight group name: 1', funcs.setmatches,
+               {{group=1, pattern=2, id=3, priority=4}})
     eq({}, funcs.getmatches())
-    eq(-1, funcs.setmatches({{group=1, pos1={2}, pos2={6}, id=3, priority=4, conceal=5}}))
+    expect_err('E28: No such highlight group name: 1', funcs.setmatches,
+               {{group=1, pos1={2}, pos2={6}, id=3, priority=4, conceal=5}})
     eq({}, funcs.getmatches())
   end)
 end)
diff --git a/test/functional/eval/server_spec.lua b/test/functional/eval/server_spec.lua
index 4e4aed864b..563e619b39 100644
--- a/test/functional/eval/server_spec.lua
+++ b/test/functional/eval/server_spec.lua
@@ -5,6 +5,7 @@ local clear, funcs, meths = helpers.clear, helpers.funcs, helpers.meths
 local iswin = helpers.iswin
 local ok = helpers.ok
 local matches = helpers.matches
+local expect_err = helpers.expect_err
 
 local function clear_serverlist()
   for _, server in pairs(funcs.serverlist()) do
@@ -86,22 +87,23 @@ describe('server', function()
 
     local expected = {}
     local v4 = '127.0.0.1:12345'
-    s = funcs.serverstart(v4)
-    if #s > 0 then
+    local status, _ = pcall(funcs.serverstart, v4)
+    if status then
       table.insert(expected, v4)
-      funcs.serverstart(v4)  -- exists already; ignore
+      pcall(funcs.serverstart, v4)  -- exists already; ignore
     end
 
     local v6 = '::1:12345'
-    s = funcs.serverstart(v6)
-    if #s > 0 then
+    status, _ = pcall(funcs.serverstart, v6)
+    if status then
       table.insert(expected, v6)
-      funcs.serverstart(v6)  -- exists already; ignore
+      pcall(funcs.serverstart, v6)  -- exists already; ignore
     end
     eq(expected, funcs.serverlist())
     clear_serverlist()
 
-    funcs.serverstart('127.0.0.1:65536')  -- invalid port
+    expect_err('Failed to start server: invalid argument',
+               funcs.serverstart, '127.0.0.1:65536')  -- invalid port
     eq({}, funcs.serverlist())
   end)