test: Minimize shada/helpers.lua #10728

1 files changed, 24 insertions, 35 deletions

diff --git a/test/functional/shada/helpers.lua b/test/functional/shada/helpers.lua
index d5e061bb50..fb3ec4a87c 100644
--- a/test/functional/shada/helpers.lua
+++ b/test/functional/shada/helpers.lua
@@ -1,47 +1,39 @@
 local helpers = require('test.functional.helpers')(nil)
-local spawn, set_session, meths, nvim_prog =
-  helpers.spawn, helpers.set_session, helpers.meths, helpers.nvim_prog
-local write_file, merge_args = helpers.write_file, helpers.merge_args
+local meths = helpers.meths
+local write_file = helpers.write_file
+local concat_tables = helpers.concat_tables
 
 local mpack = require('mpack')
 
 local tmpname = helpers.tmpname()
-local append_argv = nil
 
-local function nvim_argv(shada_file, embed)
-  if embed == nil then
-    embed = true
+--   o={
+--     args=…,
+--     args_rm=…,
+--     shadafile=…,
+--   }
+local function reset(o)
+  assert(o == nil or type(o) == 'table' or type(o) == 'string')
+  o = o and o or {}
+  local args_rm = o.args_rm or {}
+  table.insert(args_rm, '-i')
+  local args={
+    '-i', o.shadafile or tmpname,
+  }
+  if type(o) == 'string' then
+    args = concat_tables(args, {'--cmd', o})
+  elseif o.args then
+    args = concat_tables(args, o.args)
   end
-  local argv = {nvim_prog, '-u', 'NONE', '-i', shada_file or tmpname, '-N',
-                '--cmd', 'set shortmess+=I background=light noswapfile',
-                '--headless', embed  and '--embed' or nil}
-  if helpers.prepend_argv or append_argv then
-    return merge_args(helpers.prepend_argv, argv, append_argv)
-  else
-    return argv
-  end
-end
-
-local reset = function(shada_file)
-  set_session(spawn(nvim_argv(shada_file)))
+  helpers.clear{
+    args_rm=args_rm,
+    args=args,
+  }
   meths.set_var('tmpname', tmpname)
 end
 
-local set_additional_cmd = function(s)
-  append_argv = {'--cmd', s}
-end
-
-local function add_argv(...)
-  if select('#', ...) == 0 then
-    append_argv = nil
-  else
-    append_argv = {...}
-  end
-end
-
 local clear = function()
   os.remove(tmpname)
-  append_argv = nil
 end
 
 local get_shada_rw = function(fname)
@@ -89,10 +81,7 @@ end
 
 return {
   reset=reset,
-  set_additional_cmd=set_additional_cmd,
-  add_argv=add_argv,
   clear=clear,
   get_shada_rw=get_shada_rw,
   read_shada_file=read_shada_file,
-  nvim_argv=nvim_argv,
 }