test/pcall_err(): truncate full paths, omit linenr

ref #11271
This commit is contained in:
Justin M. Keyes
2019-10-26 01:30:58 -07:00
parent 996a057fb9
commit 316c29bbf3
3 changed files with 33 additions and 25 deletions

View File

@@ -10,7 +10,6 @@ local feed = helpers.feed
local pcall_err = helpers.pcall_err
local exec_lua = helpers.exec_lua
local matches = helpers.matches
local iswin = helpers.iswin
before_each(clear)
@@ -148,9 +147,11 @@ describe('lua stdlib', function()
]])
eq({"yy","xx"}, exec_lua("return test_table"))
-- type checked args
eq('Error executing lua: vim.schedule: expected function', pcall_err(exec_lua, "vim.schedule('stringly')"))
eq('Error executing lua: vim.schedule: expected function', pcall_err(exec_lua, "vim.schedule()"))
-- Validates args.
eq('Error executing lua: vim.schedule: expected function',
pcall_err(exec_lua, "vim.schedule('stringly')"))
eq('Error executing lua: vim.schedule: expected function',
pcall_err(exec_lua, "vim.schedule()"))
exec_lua([[
vim.schedule(function()
@@ -223,12 +224,14 @@ describe('lua stdlib', function()
matches(".*Infinite loop detected", pcall_err(split, t[1], t[2]))
end
-- type checked args
-- Validates args.
eq(true, pcall(split, 'string', 'string', nil))
local path_pattern = iswin() and '[a-zA-Z]:[^:]+:%d+:' or '[^:]+:%d+:'
matches("Error executing lua: "..path_pattern.." Expected string, got number", pcall_err(split, 1, 'string', nil))
matches("Error executing lua: "..path_pattern.." Expected string, got number", pcall_err(split, 'string', 1, nil))
matches("Error executing lua: "..path_pattern.." Expected boolean or nil, got number", pcall_err(split, 'string', 'string', 1))
eq('Error executing lua: .../shared.lua: Expected string, got number',
pcall_err(split, 1, 'string', nil))
eq('Error executing lua: .../shared.lua: Expected string, got number',
pcall_err(split, 'string', 1, nil))
eq('Error executing lua: .../shared.lua: Expected boolean or nil, got number',
pcall_err(split, 'string', 'string', 1))
end)
it('vim.trim', function()
@@ -247,9 +250,9 @@ describe('lua stdlib', function()
assert(t[2], trim(t[1]))
end
-- type checked args
local path_pattern = iswin() and '[a-zA-Z]:[^:]+:%d+:' or '[^:]+:%d+:'
matches("Error executing lua: "..path_pattern.." Expected string, got number", pcall_err(trim, 2))
-- Validates args.
eq('Error executing lua: .../shared.lua: Expected string, got number',
pcall_err(trim, 2))
end)
it('vim.inspect', function()
@@ -289,15 +292,11 @@ describe('lua stdlib', function()
end)
it('vim.pesc', function()
local pesc = function(s)
return exec_lua('return vim.pesc(...)', s)
end
eq('foo%-bar', exec_lua([[return vim.pesc('foo-bar')]]))
eq('foo%%%-bar', exec_lua([[return vim.pesc(vim.pesc('foo-bar'))]]))
eq('foo%-bar', pesc('foo-bar'))
eq('foo%%%-bar', pesc(pesc('foo-bar')))
-- type checked args
local path_pattern = iswin() and '[a-zA-Z]:[^:]+:%d+:' or '[^:]+:%d+:'
matches("Error executing lua: "..path_pattern.." Expected string, got number", pcall_err(pesc, 2))
-- Validates args.
eq("Error executing lua: .../shared.lua: Expected string, got number",
pcall_err(exec_lua, [[return vim.pesc(2)]]))
end)
end)