10 files changed, 140 insertions, 127 deletions
diff --git a/test/functional/core/channels_spec.lua b/test/functional/core/channels_spec.lua
index 84a7bf6ddc..a98e190a60 100644
--- a/test/functional/core/channels_spec.lua
+++ b/test/functional/core/channels_spec.lua
@@ -1,15 +1,17 @@
-local t = require('test.functional.testutil')()
-local clear, eq, eval, next_msg, ok, source = t.clear, t.eq, t.eval, t.next_msg, t.ok, t.source
-local command, fn, api = t.command, t.fn, t.api
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local clear, eq, eval, next_msg, ok, source = n.clear, t.eq, n.eval, n.next_msg, t.ok, n.source
+local command, fn, api = n.command, n.fn, n.api
 local matches = t.matches
 local sleep = vim.uv.sleep
-local spawn, nvim_argv = t.spawn, t.nvim_argv
-local get_session, set_session = t.get_session, t.set_session
-local nvim_prog = t.nvim_prog
+local spawn, nvim_argv = n.spawn, n.nvim_argv
+local get_session, set_session = n.get_session, n.set_session
+local nvim_prog = n.nvim_prog
 local is_os = t.is_os
 local retry = t.retry
-local expect_twostreams = t.expect_twostreams
-local assert_alive = t.assert_alive
+local expect_twostreams = n.expect_twostreams
+local assert_alive = n.assert_alive
 local pcall_err = t.pcall_err
 local skip = t.skip
 
diff --git a/test/functional/core/exit_spec.lua b/test/functional/core/exit_spec.lua
index 0e7ddf8bd1..34c3eedbd2 100644
--- a/test/functional/core/exit_spec.lua
+++ b/test/functional/core/exit_spec.lua
@@ -1,24 +1,25 @@
-local t = require('test.functional.testutil')()
-
-local assert_alive = t.assert_alive
-local command = t.command
-local feed_command = t.feed_command
-local feed = t.feed
-local eval = t.eval
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local assert_alive = n.assert_alive
+local command = n.command
+local feed_command = n.feed_command
+local feed = n.feed
+local eval = n.eval
 local eq = t.eq
-local run = t.run
-local fn = t.fn
-local nvim_prog = t.nvim_prog
+local run = n.run
+local fn = n.fn
+local nvim_prog = n.nvim_prog
 local pcall_err = t.pcall_err
-local exec_capture = t.exec_capture
-local poke_eventloop = t.poke_eventloop
+local exec_capture = n.exec_capture
+local poke_eventloop = n.poke_eventloop
 
 describe('v:exiting', function()
   local cid
 
   before_each(function()
-    t.clear()
-    cid = t.api.nvim_get_chan_info(0).id
+    n.clear()
+    cid = n.api.nvim_get_chan_info(0).id
   end)
 
   it('defaults to v:null', function()
@@ -74,7 +75,7 @@ describe(':cquit', function()
   end
 
   before_each(function()
-    t.clear()
+    n.clear()
   end)
 
   it('exits with non-zero after :cquit', function()
diff --git a/test/functional/core/fileio_spec.lua b/test/functional/core/fileio_spec.lua
index 349f79e316..5b0be1e83c 100644
--- a/test/functional/core/fileio_spec.lua
+++ b/test/functional/core/fileio_spec.lua
@@ -1,37 +1,38 @@
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+local Screen = require('test.functional.ui.screen')
 local uv = vim.uv
-local t = require('test.functional.testutil')()
 
 local assert_log = t.assert_log
 local assert_nolog = t.assert_nolog
-local clear = t.clear
-local command = t.command
+local clear = n.clear
+local command = n.command
 local eq = t.eq
 local neq = t.neq
 local ok = t.ok
-local feed = t.feed
-local fn = t.fn
-local nvim_prog = t.nvim_prog
-local request = t.request
+local feed = n.feed
+local fn = n.fn
+local nvim_prog = n.nvim_prog
+local request = n.request
 local retry = t.retry
-local rmdir = t.rmdir
+local rmdir = n.rmdir
 local matches = t.matches
-local api = t.api
+local api = n.api
 local mkdir = t.mkdir
 local sleep = vim.uv.sleep
 local read_file = t.read_file
 local trim = vim.trim
-local currentdir = t.fn.getcwd
-local assert_alive = t.assert_alive
-local check_close = t.check_close
-local expect_exit = t.expect_exit
+local currentdir = n.fn.getcwd
+local assert_alive = n.assert_alive
+local check_close = n.check_close
+local expect_exit = n.expect_exit
 local write_file = t.write_file
-local Screen = require('test.functional.ui.screen')
-local feed_command = t.feed_command
+local feed_command = n.feed_command
 local skip = t.skip
 local is_os = t.is_os
 local is_ci = t.is_ci
-local spawn = t.spawn
-local set_session = t.set_session
+local spawn = n.spawn
+local set_session = n.set_session
 
 describe('fileio', function()
   before_each(function() end)
@@ -228,7 +229,7 @@ describe('fileio', function()
 
     local initial_content = 'foo'
     local backup_dir = 'Xtest_backupdir'
-    local sep = t.get_pathsep()
+    local sep = n.get_pathsep()
     local link_file_name = 'Xtest_startup_file2'
     local backup_file_name = backup_dir .. sep .. link_file_name .. '~'
 
diff --git a/test/functional/core/job_spec.lua b/test/functional/core/job_spec.lua
index f8144e9c05..e1efc07452 100644
--- a/test/functional/core/job_spec.lua
+++ b/test/functional/core/job_spec.lua
@@ -1,38 +1,39 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+local Screen = require('test.functional.ui.screen')
 local tt = require('test.functional.terminal.testutil')
 
-local clear = t.clear
+local clear = n.clear
 local eq = t.eq
-local eval = t.eval
-local exc_exec = t.exc_exec
-local feed_command = t.feed_command
-local feed = t.feed
-local insert = t.insert
+local eval = n.eval
+local exc_exec = n.exc_exec
+local feed_command = n.feed_command
+local feed = n.feed
+local insert = n.insert
 local neq = t.neq
-local next_msg = t.next_msg
-local testprg = t.testprg
+local next_msg = n.next_msg
+local testprg = n.testprg
 local ok = t.ok
-local source = t.source
+local source = n.source
 local write_file = t.write_file
 local mkdir = t.mkdir
-local rmdir = t.rmdir
-local assert_alive = t.assert_alive
-local command = t.command
-local fn = t.fn
-local os_kill = t.os_kill
+local rmdir = n.rmdir
+local assert_alive = n.assert_alive
+local command = n.command
+local fn = n.fn
+local os_kill = n.os_kill
 local retry = t.retry
-local api = t.api
+local api = n.api
 local NIL = vim.NIL
-local poke_eventloop = t.poke_eventloop
-local get_pathsep = t.get_pathsep
-local pathroot = t.pathroot
-local exec_lua = t.exec_lua
-local nvim_set = t.nvim_set
-local expect_twostreams = t.expect_twostreams
-local expect_msg_seq = t.expect_msg_seq
+local poke_eventloop = n.poke_eventloop
+local get_pathsep = n.get_pathsep
+local pathroot = n.pathroot
+local exec_lua = n.exec_lua
+local nvim_set = n.nvim_set
+local expect_twostreams = n.expect_twostreams
+local expect_msg_seq = n.expect_msg_seq
 local pcall_err = t.pcall_err
 local matches = t.matches
-local Screen = require('test.functional.ui.screen')
 local skip = t.skip
 local is_os = t.is_os
 
@@ -732,7 +733,7 @@ describe('jobs', function()
   describe('jobwait()', function()
     before_each(function()
       if is_os('win') then
-        t.set_shell_powershell()
+        n.set_shell_powershell()
       end
     end)
 
@@ -1239,7 +1240,7 @@ describe('pty process teardown', function()
     skip(fn.executable('sleep') == 0, 'missing "sleep" command')
     -- Use a nested nvim (in :term) to test without --headless.
     fn.termopen({
-      t.nvim_prog,
+      n.nvim_prog,
       '-u',
       'NONE',
       '-i',
diff --git a/test/functional/core/log_spec.lua b/test/functional/core/log_spec.lua
index dd08d81342..cac61cda2d 100644
--- a/test/functional/core/log_spec.lua
+++ b/test/functional/core/log_spec.lua
@@ -1,11 +1,13 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
 local assert_log = t.assert_log
-local clear = t.clear
-local command = t.command
+local clear = n.clear
+local command = n.command
 local eq = t.eq
-local exec_lua = t.exec_lua
-local expect_exit = t.expect_exit
-local request = t.request
+local exec_lua = n.exec_lua
+local expect_exit = n.expect_exit
+local request = n.request
 
 describe('log', function()
   local testlog = 'Xtest_logging'
diff --git a/test/functional/core/main_spec.lua b/test/functional/core/main_spec.lua
index a318fdec3c..5e903726db 100644
--- a/test/functional/core/main_spec.lua
+++ b/test/functional/core/main_spec.lua
@@ -1,14 +1,15 @@
-local uv = vim.uv
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
+local uv = vim.uv
 
 local eq = t.eq
 local matches = t.matches
-local feed = t.feed
-local eval = t.eval
-local clear = t.clear
-local fn = t.fn
-local nvim_prog_abs = t.nvim_prog_abs
+local feed = n.feed
+local eval = n.eval
+local clear = n.clear
+local fn = n.fn
+local nvim_prog_abs = n.nvim_prog_abs
 local write_file = t.write_file
 local is_os = t.is_os
 local skip = t.skip
diff --git a/test/functional/core/path_spec.lua b/test/functional/core/path_spec.lua
index 92fcde978b..d8e274019a 100644
--- a/test/functional/core/path_spec.lua
+++ b/test/functional/core/path_spec.lua
@@ -1,14 +1,16 @@
-local t = require('test.functional.testutil')()
-local clear = t.clear
-local command = t.command
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local clear = n.clear
+local command = n.command
 local eq = t.eq
-local eval = t.eval
-local feed = t.feed
-local fn = t.fn
-local insert = t.insert
+local eval = n.eval
+local feed = n.feed
+local fn = n.fn
+local insert = n.insert
 local is_os = t.is_os
 local mkdir = t.mkdir
-local rmdir = t.rmdir
+local rmdir = n.rmdir
 local write_file = t.write_file
 
 local function join_path(...)
diff --git a/test/functional/core/remote_spec.lua b/test/functional/core/remote_spec.lua
index 0b110a3538..6cc28ddeef 100644
--- a/test/functional/core/remote_spec.lua
+++ b/test/functional/core/remote_spec.lua
@@ -1,18 +1,19 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 
-local clear = t.clear
-local command = t.command
+local clear = n.clear
+local command = n.command
 local eq = t.eq
-local exec_capture = t.exec_capture
-local exec_lua = t.exec_lua
-local expect = t.expect
-local fn = t.fn
-local insert = t.insert
-local nvim_prog = t.nvim_prog
-local new_argv = t.new_argv
+local exec_capture = n.exec_capture
+local exec_lua = n.exec_lua
+local expect = n.expect
+local fn = n.fn
+local insert = n.insert
+local nvim_prog = n.nvim_prog
+local new_argv = n.new_argv
 local neq = t.neq
-local set_session = t.set_session
-local spawn = t.spawn
+local set_session = n.set_session
+local spawn = n.spawn
 local tmpname = t.tmpname
 local write_file = t.write_file
 
diff --git a/test/functional/core/spellfile_spec.lua b/test/functional/core/spellfile_spec.lua
index 814df522cf..e2ccb038e7 100644
--- a/test/functional/core/spellfile_spec.lua
+++ b/test/functional/core/spellfile_spec.lua
@@ -1,11 +1,12 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 
 local eq = t.eq
-local clear = t.clear
-local api = t.api
-local exc_exec = t.exc_exec
-local fn = t.fn
-local rmdir = t.rmdir
+local clear = n.clear
+local api = n.api
+local exc_exec = n.exc_exec
+local fn = n.fn
+local rmdir = n.rmdir
 local write_file = t.write_file
 local mkdir = t.mkdir
 
diff --git a/test/functional/core/startup_spec.lua b/test/functional/core/startup_spec.lua
index e98b1bdd87..a53625ab1b 100644
--- a/test/functional/core/startup_spec.lua
+++ b/test/functional/core/startup_spec.lua
@@ -1,38 +1,39 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
-local assert_alive = t.assert_alive
+local assert_alive = n.assert_alive
 local assert_log = t.assert_log
-local clear = t.clear
-local command = t.command
+local clear = n.clear
+local command = n.command
 local ok = t.ok
 local eq = t.eq
 local matches = t.matches
-local eval = t.eval
-local exec = t.exec
-local exec_capture = t.exec_capture
-local exec_lua = t.exec_lua
-local feed = t.feed
-local fn = t.fn
+local eval = n.eval
+local exec = n.exec
+local exec_capture = n.exec_capture
+local exec_lua = n.exec_lua
+local feed = n.feed
+local fn = n.fn
 local pesc = vim.pesc
 local mkdir = t.mkdir
-local mkdir_p = t.mkdir_p
-local nvim_prog = t.nvim_prog
-local nvim_set = t.nvim_set
+local mkdir_p = n.mkdir_p
+local nvim_prog = n.nvim_prog
+local nvim_set = n.nvim_set
 local read_file = t.read_file
 local retry = t.retry
-local rmdir = t.rmdir
+local rmdir = n.rmdir
 local sleep = vim.uv.sleep
 local startswith = vim.startswith
 local write_file = t.write_file
-local api = t.api
-local alter_slashes = t.alter_slashes
+local api = n.api
+local alter_slashes = n.alter_slashes
 local is_os = t.is_os
 local dedent = t.dedent
 local tbl_map = vim.tbl_map
 local tbl_filter = vim.tbl_filter
 local endswith = vim.endswith
-local check_close = t.check_close
+local check_close = n.check_close
 
 local testlog = 'Xtest-startupspec-log'
 
@@ -994,7 +995,7 @@ describe('sysinit', function()
   local xdgdir = 'Xxdg'
   local vimdir = 'Xvim'
   local xhome = 'Xhome'
-  local pathsep = t.get_pathsep()
+  local pathsep = n.get_pathsep()
 
   before_each(function()
     rmdir(xdgdir)
@@ -1055,7 +1056,7 @@ end)
 
 describe('user config init', function()
   local xhome = 'Xhome'
-  local pathsep = t.get_pathsep()
+  local pathsep = n.get_pathsep()
   local xconfig = xhome .. pathsep .. 'Xconfig'
   local xdata = xhome .. pathsep .. 'Xdata'
   local init_lua_path = table.concat({ xconfig, 'nvim', 'init.lua' }, pathsep)
@@ -1218,7 +1219,7 @@ end)
 
 describe('runtime:', function()
   local xhome = 'Xhome'
-  local pathsep = t.get_pathsep()
+  local pathsep = n.get_pathsep()
   local xconfig = xhome .. pathsep .. 'Xconfig'
   local xdata = xhome .. pathsep .. 'Xdata'
   local xenv = { XDG_CONFIG_HOME = xconfig, XDG_DATA_HOME = xdata }
@@ -1360,7 +1361,7 @@ end)
 
 describe('user session', function()
   local xhome = 'Xhome'
-  local pathsep = t.get_pathsep()
+  local pathsep = n.get_pathsep()
   local session_file = table.concat({ xhome, 'session.lua' }, pathsep)
 
   before_each(function()