aboutsummaryrefslogtreecommitdiff
path: root/test/functional/eval/server_spec.lua
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-05-07 03:24:01 +0200
committerJustin M. Keyes <justinkz@gmail.com>2018-05-09 23:18:38 +0200
commitc9f3174075a7168f10fabf806891ef59ee3b13d4 (patch)
tree67adda606732fdcfa746852a685c183bc11037a1 /test/functional/eval/server_spec.lua
parent33bfea31b0cd630f6494cf91d06c807f03d29a85 (diff)
downloadrneovim-c9f3174075a7168f10fabf806891ef59ee3b13d4.tar.gz
rneovim-c9f3174075a7168f10fabf806891ef59ee3b13d4.tar.bz2
rneovim-c9f3174075a7168f10fabf806891ef59ee3b13d4.zip
API: return non-generic VimL errors
- Return VimL errors instead of generic errors for: - nvim_call_function - nvim_call_dict_function - Fix tests which were silently broken before this change. This violates #6150 where we agreed not to translate API errors. But that can be fixed later.
Diffstat (limited to 'test/functional/eval/server_spec.lua')
-rw-r--r--test/functional/eval/server_spec.lua8
1 files changed, 5 insertions, 3 deletions
diff --git a/test/functional/eval/server_spec.lua b/test/functional/eval/server_spec.lua
index 4e4aed864b..187e138b22 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
@@ -89,19 +90,20 @@ describe('server', function()
s = funcs.serverstart(v4)
if #s > 0 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
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)