1 files changed, 62 insertions, 34 deletions

diff --git a/test/helpers.lua b/test/helpers.lua
index ebc0a7d811..40b93d9935 100644
--- a/test/helpers.lua
+++ b/test/helpers.lua
@@ -55,17 +55,32 @@ local check_logs_useless_lines = {
   ['See README_MISSING_SYSCALL_OR_IOCTL for guidance']=3,
 }
 
-function module.eq(expected, actual, context)
-  return assert.are.same(expected, actual, context)
+--- Invokes `fn` and includes the tail of `logfile` in the error message if it
+--- fails.
+---
+--@param logfile  Log file, defaults to $NVIM_LOG_FILE or '.nvimlog'
+--@param fn       Function to invoke
+--@param ...      Function arguments
+local function dumplog(logfile, fn, ...)
+  -- module.validate({
+  --   logfile={logfile,'s',true},
+  --   fn={fn,'f',false},
+  -- })
+  local status, rv = pcall(fn, ...)
+  if status == false then
+    logfile = logfile or os.getenv('NVIM_LOG_FILE') or '.nvimlog'
+    local logtail = module.read_nvim_log(logfile)
+    error(string.format('%s\n%s', rv, logtail))
+  end
 end
-function module.neq(expected, actual, context)
-  return assert.are_not.same(expected, actual, context)
+function module.eq(expected, actual, context, logfile)
+  return dumplog(logfile, assert.are.same, expected, actual, context)
 end
-function module.ok(res, msg)
-  return assert.is_true(res, msg)
+function module.neq(expected, actual, context, logfile)
+  return dumplog(logfile, assert.are_not.same, expected, actual, context)
 end
-function module.near(actual, expected, tolerance)
-  return assert.is.near(actual, expected, tolerance)
+function module.ok(res, msg, logfile)
+  return dumplog(logfile, assert.is_true, res, msg)
 end
 function module.matches(pat, actual)
   if nil ~= string.match(actual, pat) then
@@ -74,7 +89,24 @@ function module.matches(pat, actual)
   error(string.format('Pattern does not match.\nPattern:\n%s\nActual:\n%s', pat, actual))
 end
 
--- Invokes `fn` and returns the error string, or raises an error if `fn` succeeds.
+--- Asserts that `pat` matches one or more lines in the tail of $NVIM_LOG_FILE.
+---
+--@param pat  (string) Lua pattern to search for in the log file.
+--@param logfile  (string, default=$NVIM_LOG_FILE) full path to log file.
+function module.assert_log(pat, logfile)
+  logfile = logfile or os.getenv('NVIM_LOG_FILE') or '.nvimlog'
+  local nrlines = 10
+  local lines = module.read_file_list(logfile, -nrlines) or {}
+  for _,line in ipairs(lines) do
+    if line:match(pat) then return end
+  end
+  local logtail = module.read_nvim_log(logfile)
+  error(string.format('Pattern %q not found in log (last %d lines): %s:\n%s',
+    pat, nrlines, logfile, logtail))
+end
+
+-- Invokes `fn` and returns the error string (may truncate full paths), or
+-- raises an error if `fn` succeeds.
 --
 -- Usage:
 --    -- Match exact string.
@@ -88,7 +120,20 @@ function module.pcall_err(fn, ...)
   if status == true then
     error('expected failure, but got success')
   end
+  -- From this:
+  --    /home/foo/neovim/runtime/lua/vim/shared.lua:186: Expected string, got number
+  -- to this:
+  --     Expected string, got number
   local errmsg = tostring(rv):gsub('^[^:]+:%d+: ', '')
+  -- From this:
+  --    Error executing lua: /very/long/foo.lua:186: Expected string, got number
+  -- to this:
+  --    Error executing lua: .../foo.lua:186: Expected string, got number
+  errmsg = errmsg:gsub([[lua: [a-zA-Z]?:?[^:]-[/\]([^:/\]+):%d+: ]], 'lua: .../%1: ')
+  -- Compiled modules will not have a path and will just be a name like
+  -- shared.lua:186, so strip the number.
+  errmsg = errmsg:gsub([[lua: ([^:/\ ]+):%d+: ]], 'lua: .../%1: ')
+  --                          ^ Windows drive-letter (C:)
   return errmsg
 end
 
@@ -245,24 +290,6 @@ module.tmpname = (function()
   end)
 end)()
 
-function module.map(func, tab)
-  local rettab = {}
-  for k, v in pairs(tab) do
-    rettab[k] = func(v)
-  end
-  return rettab
-end
-
-function module.filter(filter_func, tab)
-  local rettab = {}
-  for _, entry in pairs(tab) do
-    if filter_func(entry) then
-      table.insert(rettab, entry)
-    end
-  end
-  return rettab
-end
-
 function module.hasenv(name)
   local env = os.getenv(name)
   if env and env ~= '' then
@@ -715,17 +742,18 @@ end
 
 function module.isCI(name)
   local any = (name == nil)
-  assert(any or name == 'appveyor' or name == 'quickbuild' or name == 'travis')
+  assert(any or name == 'appveyor' or name == 'travis' or name == 'sourcehut')
   local av = ((any or name == 'appveyor') and nil ~= os.getenv('APPVEYOR'))
   local tr = ((any or name == 'travis') and nil ~= os.getenv('TRAVIS'))
-  local qb = ((any or name == 'quickbuild') and nil ~= lfs.attributes('/usr/home/quickbuild'))
-  return tr or av or qb
+  local sh = ((any or name == 'sourcehut') and nil ~= os.getenv('SOURCEHUT'))
+  return tr or av or sh
+
 end
 
--- Gets the contents of $NVIM_LOG_FILE for printing to the build log.
+-- Gets the (tail) contents of `logfile`.
 -- Also moves the file to "${NVIM_LOG_FILE}.displayed" on CI environments.
-function module.read_nvim_log()
-  local logfile = os.getenv('NVIM_LOG_FILE') or '.nvimlog'
+function module.read_nvim_log(logfile, ci_rename)
+  logfile = logfile or os.getenv('NVIM_LOG_FILE') or '.nvimlog'
   local is_ci = module.isCI()
   local keep = is_ci and 999 or 10
   local lines = module.read_file_list(logfile, -keep) or {}
@@ -736,7 +764,7 @@ function module.read_nvim_log()
     log = log..line..'\n'
   end
   log = log..('-'):rep(78)..'\n'
-  if is_ci then
+  if is_ci and ci_rename then
     os.rename(logfile, logfile .. '.displayed')
   end
   return log