Merge remote-tracking branch 'upstream/master' into rahm

1 files changed, 38 insertions, 17 deletions

diff --git a/test/functional/vimscript/server_spec.lua b/test/functional/vimscript/server_spec.lua
index 238d1aeb0f..6e95459630 100644
--- a/test/functional/vimscript/server_spec.lua
+++ b/test/functional/vimscript/server_spec.lua
@@ -1,11 +1,11 @@
 local helpers = require('test.functional.helpers')(after_each)
 local eq, neq, eval = helpers.eq, helpers.neq, helpers.eval
-local command = helpers.command
 local clear, funcs, meths = helpers.clear, helpers.funcs, helpers.meths
 local iswin = helpers.iswin
 local ok = helpers.ok
 local matches = helpers.matches
 local pcall_err = helpers.pcall_err
+local mkdir = helpers.mkdir
 
 local function clear_serverlist()
   for _, server in pairs(funcs.serverlist()) do
@@ -14,29 +14,38 @@ local function clear_serverlist()
 end
 
 describe('server', function()
-  before_each(clear)
+  it('serverstart() stores sockets in $XDG_RUNTIME_DIR', function()
+    local dir = 'Xtest_xdg_run'
+    mkdir(dir)
+    clear({ env={ XDG_RUNTIME_DIR=dir } })
+    matches(dir, funcs.stdpath('run'))
+    if not iswin() then
+      matches(dir, funcs.serverstart())
+    end
+  end)
 
-  it('serverstart() sets $NVIM_LISTEN_ADDRESS on first invocation', function()
-    -- Unset $NVIM_LISTEN_ADDRESS
-    command('let $NVIM_LISTEN_ADDRESS = ""')
 
+  it('serverstart(), serverstop() does not set $NVIM', function()
+    clear()
     local s = eval('serverstart()')
     assert(s ~= nil and s:len() > 0, "serverstart() returned empty")
-    eq(s, eval('$NVIM_LISTEN_ADDRESS'))
+    eq('', eval('$NVIM'))
+    eq('', eval('$NVIM_LISTEN_ADDRESS'))
     eq(1, eval("serverstop('"..s.."')"))
     eq('', eval('$NVIM_LISTEN_ADDRESS'))
   end)
 
   it('sets new v:servername if $NVIM_LISTEN_ADDRESS is invalid', function()
     clear({env={NVIM_LISTEN_ADDRESS='.'}})
-    eq('.', eval('$NVIM_LISTEN_ADDRESS'))
+    -- Cleared on startup.
+    eq('', eval('$NVIM_LISTEN_ADDRESS'))
     local servers = funcs.serverlist()
     eq(1, #servers)
-    ok(string.len(servers[1]) > 4)  -- Like /tmp/nvim…/… or \\.\pipe\…
+    ok(string.len(servers[1]) > 4)  -- "~/.local/state/nvim…/…" or "\\.\pipe\…"
   end)
 
-  it('sets v:servername at startup or if all servers were stopped',
-  function()
+  it('sets v:servername at startup or if all servers were stopped', function()
+    clear()
     local initial_server = meths.get_vvar('servername')
     assert(initial_server ~= nil and initial_server:len() > 0,
            'v:servername was not initialized')
@@ -55,19 +64,23 @@ describe('server', function()
     eq(1, funcs.serverstop(funcs.serverlist()[1]))
     eq('', meths.get_vvar('servername'))
 
-    -- v:servername will take the next available server.
+    -- v:servername and $NVIM take the next available server.
     local servername = (iswin() and [[\\.\pipe\Xtest-functional-server-pipe]]
-                                or 'Xtest-functional-server-socket')
+                                or './Xtest-functional-server-socket')
     funcs.serverstart(servername)
     eq(servername, meths.get_vvar('servername'))
+    -- Not set in the current process, only in children.
+    eq('', eval('$NVIM'))
   end)
 
   it('serverstop() returns false for invalid input', function()
+    clear()
     eq(0, eval("serverstop('')"))
     eq(0, eval("serverstop('bogus-socket-name')"))
   end)
 
-  it('parses endpoints correctly', function()
+  it('parses endpoints', function()
+    clear()
     clear_serverlist()
     eq({}, funcs.serverlist())
 
@@ -102,19 +115,24 @@ describe('server', function()
     eq(expected, funcs.serverlist())
     clear_serverlist()
 
+    -- Address without slashes is a "name" which is appended to a generated path. #8519
+    matches([[.*[/\\]xtest1%.2%.3%.4[^/\\]*]], funcs.serverstart('xtest1.2.3.4'))
+    clear_serverlist()
+
     eq('Vim:Failed to start server: invalid argument',
       pcall_err(funcs.serverstart, '127.0.0.1:65536'))  -- invalid port
     eq({}, funcs.serverlist())
   end)
 
   it('serverlist() returns the list of servers', function()
+    clear()
     -- There should already be at least one server.
     local n = eval('len(serverlist())')
 
     -- Add some servers.
     local servs = (iswin()
       and { [[\\.\pipe\Xtest-pipe0934]], [[\\.\pipe\Xtest-pipe4324]] }
-      or  { [[Xtest-pipe0934]], [[Xtest-pipe4324]] })
+      or  { [[./Xtest-pipe0934]], [[./Xtest-pipe4324]] })
     for _, s in ipairs(servs) do
       eq(s, eval("serverstart('"..s.."')"))
     end
@@ -136,7 +154,6 @@ end)
 describe('startup --listen', function()
   it('validates', function()
     clear()
-
     local cmd = { unpack(helpers.nvim_argv) }
     table.insert(cmd, '--listen')
     matches('nvim.*: Argument missing after: "%-%-listen"', funcs.system(cmd))
@@ -148,9 +165,13 @@ describe('startup --listen', function()
 
   it('sets v:servername, overrides $NVIM_LISTEN_ADDRESS', function()
     local addr = (iswin() and [[\\.\pipe\Xtest-listen-pipe]]
-                          or 'Xtest-listen-pipe')
-    clear({ env={ NVIM_LISTEN_ADDRESS='Xtest-env-pipe' },
+                          or './Xtest-listen-pipe')
+    clear({ env={ NVIM_LISTEN_ADDRESS='./Xtest-env-pipe' },
             args={ '--listen', addr } })
     eq(addr, meths.get_vvar('servername'))
+
+    -- Address without slashes is a "name" which is appended to a generated path. #8519
+    clear({ args={ '--listen', 'test-name' } })
+    matches([[.*[/\\]test%-name[^/\\]*]], meths.get_vvar('servername'))
   end)
 end)