Merge PR #2146 'Improve functional test debuggability and efficiency'

1 files changed, 12 insertions, 7 deletions

diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 5627b1fae2..393b42dda5 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -162,15 +162,20 @@ local function rawfeed(...)
   end
 end
 
+local function spawn(argv)
+  local loop = Loop.new()
+  local msgpack_stream = MsgpackStream.new(loop)
+  local async_session = AsyncSession.new(msgpack_stream)
+  local session = Session.new(async_session)
+  loop:spawn(argv)
+  return session
+end
+
 local function clear()
   if session then
     session:exit(0)
   end
-  local loop = Loop.new()
-  local msgpack_stream = MsgpackStream.new(loop)
-  local async_session = AsyncSession.new(msgpack_stream)
-  session = Session.new(async_session)
-  loop:spawn(nvim_argv)
+  session = spawn(nvim_argv)
 end
 
 local function insert(...)
@@ -271,10 +276,9 @@ local function expect(contents)
   return eq(dedent(contents), curbuf_contents())
 end
 
-clear()
-
 return {
   clear = clear,
+  spawn = spawn,
   dedent = dedent,
   source = source,
   rawfeed = rawfeed,
@@ -292,6 +296,7 @@ return {
   expect = expect,
   ok = ok,
   nvim = nvim,
+  nvim_prog = nvim_prog,
   nvim_dir = nvim_dir,
   buffer = buffer,
   window = window,