1 files changed, 25 insertions, 17 deletions
diff --git a/test/functional/vimscript/server_spec.lua b/test/functional/vimscript/server_spec.lua
index 360fcf0dfe..4b0dc087f6 100644
--- a/test/functional/vimscript/server_spec.lua
+++ b/test/functional/vimscript/server_spec.lua
@@ -1,12 +1,16 @@
-local helpers = require('test.functional.helpers')(after_each)
-local assert_log = helpers.assert_log
-local eq, neq, eval = helpers.eq, helpers.neq, helpers.eval
-local clear, fn, api = helpers.clear, helpers.fn, helpers.api
-local ok = helpers.ok
-local matches = helpers.matches
-local pcall_err = helpers.pcall_err
-local mkdir = helpers.mkdir
-local is_os = helpers.is_os
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local assert_log = t.assert_log
+local eq, neq, eval = t.eq, t.neq, n.eval
+local clear, fn, api = n.clear, n.fn, n.api
+local ok = t.ok
+local matches = t.matches
+local pcall_err = t.pcall_err
+local check_close = n.check_close
+local mkdir = t.mkdir
+local rmdir = n.rmdir
+local is_os = t.is_os
 
 local testlog = 'Xtest-server-log'
 
@@ -18,12 +22,16 @@ end
 
 describe('server', function()
   after_each(function()
+    check_close()
     os.remove(testlog)
   end)
 
   it('serverstart() stores sockets in $XDG_RUNTIME_DIR', function()
     local dir = 'Xtest_xdg_run'
     mkdir(dir)
+    finally(function()
+      rmdir(dir)
+    end)
     clear({ env = { XDG_RUNTIME_DIR = dir } })
     matches(dir, fn.stdpath('run'))
     if not is_os('win') then
@@ -100,14 +108,14 @@ describe('server', function()
 
     local s = fn.serverstart('127.0.0.1:0') -- assign random port
     if #s > 0 then
-      assert(string.match(s, '127.0.0.1:%d+'))
+      matches('127.0.0.1:%d+', s)
       eq(s, fn.serverlist()[1])
       clear_serverlist()
     end
 
     s = fn.serverstart('127.0.0.1:') -- assign random port
     if #s > 0 then
-      assert(string.match(s, '127.0.0.1:%d+'))
+      matches('127.0.0.1:%d+', s)
       eq(s, fn.serverlist()[1])
       clear_serverlist()
     end
@@ -142,7 +150,7 @@ describe('server', function()
   it('serverlist() returns the list of servers', function()
     clear()
     -- There should already be at least one server.
-    local n = eval('len(serverlist())')
+    local _n = eval('len(serverlist())')
 
     -- Add some servers.
     local servs = (
@@ -156,25 +164,25 @@ describe('server', function()
     local new_servs = eval('serverlist()')
 
     -- Exactly #servs servers should be added.
-    eq(n + #servs, #new_servs)
+    eq(_n + #servs, #new_servs)
     -- The new servers should be at the end of the list.
     for i = 1, #servs do
-      eq(servs[i], new_servs[i + n])
+      eq(servs[i], new_servs[i + _n])
       eq(1, eval("serverstop('" .. servs[i] .. "')"))
     end
     -- After serverstop() the servers should NOT be in the list.
-    eq(n, eval('len(serverlist())'))
+    eq(_n, eval('len(serverlist())'))
   end)
 end)
 
 describe('startup --listen', function()
   it('validates', function()
     clear()
-    local cmd = { unpack(helpers.nvim_argv) }
+    local cmd = { unpack(n.nvim_argv) }
     table.insert(cmd, '--listen')
     matches('nvim.*: Argument missing after: "%-%-listen"', fn.system(cmd))
 
-    cmd = { unpack(helpers.nvim_argv) }
+    cmd = { unpack(n.nvim_argv) }
     table.insert(cmd, '--listen2')
     matches('nvim.*: Garbage after option argument: "%-%-listen2"', fn.system(cmd))
   end)