From f913ba6e06549cbfed873792cde0b9c4392c9a2e Mon Sep 17 00:00:00 2001 From: Marco Hinz Date: Thu, 11 May 2017 15:22:17 +0200 Subject: Server tests: use helpers.command() --- test/functional/eval/server_spec.lua | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'test/functional/eval/server_spec.lua') diff --git a/test/functional/eval/server_spec.lua b/test/functional/eval/server_spec.lua index 420aea04aa..e1d268a7d8 100644 --- a/test/functional/eval/server_spec.lua +++ b/test/functional/eval/server_spec.lua @@ -1,6 +1,7 @@ local helpers = require('test.functional.helpers')(after_each) -local nvim, eq, neq, eval = helpers.nvim, helpers.eq, helpers.neq, helpers.eval +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 os_name = helpers.os_name @@ -9,12 +10,12 @@ describe('serverstart(), serverstop()', function() it('sets $NVIM_LISTEN_ADDRESS on first invocation', function() -- Unset $NVIM_LISTEN_ADDRESS - nvim('command', 'let $NVIM_LISTEN_ADDRESS = ""') + command('let $NVIM_LISTEN_ADDRESS = ""') local s = eval('serverstart()') assert(s ~= nil and s:len() > 0, "serverstart() returned empty") eq(s, eval('$NVIM_LISTEN_ADDRESS')) - nvim('command', "call serverstop('"..s.."')") + command("call serverstop('"..s.."')") eq('', eval('$NVIM_LISTEN_ADDRESS')) end) @@ -47,8 +48,8 @@ describe('serverstart(), serverstop()', function() end) it('serverstop() ignores invalid input', function() - nvim('command', "call serverstop('')") - nvim('command', "call serverstop('bogus-socket-name')") + command("call serverstop('')") + command("call serverstop('bogus-socket-name')") end) end) @@ -75,7 +76,7 @@ describe('serverlist()', function() -- The new servers should be at the end of the list. for i = 1, #servs do eq(servs[i], new_servs[i + n]) - nvim('command', "call serverstop('"..servs[i].."')") + command("call serverstop('"..servs[i].."')") end -- After serverstop() the servers should NOT be in the list. eq(n, eval('len(serverlist())')) -- cgit From afa781f42058b82fa9b25b7de755b521a878323e Mon Sep 17 00:00:00 2001 From: Marco Hinz Date: Thu, 11 May 2017 15:46:13 +0200 Subject: Server tests: endpoint parsing in serverstart() --- test/functional/eval/server_spec.lua | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'test/functional/eval/server_spec.lua') diff --git a/test/functional/eval/server_spec.lua b/test/functional/eval/server_spec.lua index e1d268a7d8..a621be2100 100644 --- a/test/functional/eval/server_spec.lua +++ b/test/functional/eval/server_spec.lua @@ -5,6 +5,12 @@ local command = helpers.command local clear, funcs, meths = helpers.clear, helpers.funcs, helpers.meths local os_name = helpers.os_name +local function clear_serverlist() + for _, server in pairs(funcs.serverlist()) do + funcs.serverstop(server) + end +end + describe('serverstart(), serverstop()', function() before_each(clear) @@ -52,6 +58,32 @@ describe('serverstart(), serverstop()', function() command("call serverstop('bogus-socket-name')") end) + it('parses endpoints correctly', function() + clear_serverlist() + eq({}, funcs.serverlist()) + + funcs.serverstart('127.0.0.1:0') -- assign random port + assert(string.match(funcs.serverlist()[1], '127.0.0.1:%d+')) + clear_serverlist() + + funcs.serverstart('127.0.0.1:') -- assign random port + assert(string.match(funcs.serverlist()[1], '127.0.0.1:%d+')) + clear_serverlist() + + funcs.serverstart('127.0.0.1:12345') + funcs.serverstart('127.0.0.1:12345') -- exists already; ignore + funcs.serverstart('::1:12345') + funcs.serverstart('::1:12345') -- exists already; ignore + local expected = { + '127.0.0.1:12345', + '::1:12345', + } + eq(expected, funcs.serverlist()) + clear_serverlist() + + funcs.serverstart('127.0.0.1:65536') -- invalid port + eq({}, funcs.serverlist()) + end) end) describe('serverlist()', function() -- cgit From 6c135b89ee83a9b278cba88889fe4f388ee8aebd Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sat, 27 May 2017 22:25:06 -0400 Subject: eval: serverstart: Return finalized address to user In the process of setting up the socket watcher, the address may be changed (e.g., adding the OS-selected port). --- test/functional/eval/server_spec.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'test/functional/eval/server_spec.lua') diff --git a/test/functional/eval/server_spec.lua b/test/functional/eval/server_spec.lua index a621be2100..115114c3c3 100644 --- a/test/functional/eval/server_spec.lua +++ b/test/functional/eval/server_spec.lua @@ -62,12 +62,14 @@ describe('serverstart(), serverstop()', function() clear_serverlist() eq({}, funcs.serverlist()) - funcs.serverstart('127.0.0.1:0') -- assign random port - assert(string.match(funcs.serverlist()[1], '127.0.0.1:%d+')) + local s = funcs.serverstart('127.0.0.1:0') -- assign random port + assert(string.match(s, '127.0.0.1:%d+')) + eq(s, funcs.serverlist()[1]) clear_serverlist() - funcs.serverstart('127.0.0.1:') -- assign random port - assert(string.match(funcs.serverlist()[1], '127.0.0.1:%d+')) + s = funcs.serverstart('127.0.0.1:') -- assign random port + assert(string.match(s, '127.0.0.1:%d+')) + eq(s, funcs.serverlist()[1]) clear_serverlist() funcs.serverstart('127.0.0.1:12345') -- cgit From a39c8b7ce30ddeed4329c28c42b1b699103dccab Mon Sep 17 00:00:00 2001 From: James McCoy Date: Thu, 2 Nov 2017 05:45:38 -0400 Subject: test: server_spec: Tolerate missing protocol (#7478) Travis disabled IPv6: [ RUN ] serverstart(), serverstop() parses endpoints correctly: FAIL ...build/neovim/neovim/test/functional/eval/server_spec.lua:83: Expected objects to be the same. Passed in: (table) { [1] = '127.0.0.1:12345' } Expected: (table) { [1] = '127.0.0.1:12345' *[2] = '::1:12345' } Change all tests to ensure a server was actually started before expecting it to be returned from serverlist(). --- test/functional/eval/server_spec.lua | 38 +++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 14 deletions(-) (limited to 'test/functional/eval/server_spec.lua') diff --git a/test/functional/eval/server_spec.lua b/test/functional/eval/server_spec.lua index 115114c3c3..393616838e 100644 --- a/test/functional/eval/server_spec.lua +++ b/test/functional/eval/server_spec.lua @@ -63,23 +63,33 @@ describe('serverstart(), serverstop()', function() eq({}, funcs.serverlist()) local s = funcs.serverstart('127.0.0.1:0') -- assign random port - assert(string.match(s, '127.0.0.1:%d+')) - eq(s, funcs.serverlist()[1]) - clear_serverlist() + if #s > 0 then + assert(string.match(s, '127.0.0.1:%d+')) + eq(s, funcs.serverlist()[1]) + clear_serverlist() + end s = funcs.serverstart('127.0.0.1:') -- assign random port - assert(string.match(s, '127.0.0.1:%d+')) - eq(s, funcs.serverlist()[1]) - clear_serverlist() + if #s > 0 then + assert(string.match(s, '127.0.0.1:%d+')) + eq(s, funcs.serverlist()[1]) + clear_serverlist() + end - funcs.serverstart('127.0.0.1:12345') - funcs.serverstart('127.0.0.1:12345') -- exists already; ignore - funcs.serverstart('::1:12345') - funcs.serverstart('::1:12345') -- exists already; ignore - local expected = { - '127.0.0.1:12345', - '::1:12345', - } + local expected = {} + local v4 = '127.0.0.1:12345' + s = funcs.serverstart(v4) + if #s > 0 then + table.insert(expected, v4) + funcs.serverstart(v4) -- exists already; ignore + end + + local v6 = '::1:12345' + s = funcs.serverstart(v6) + if #s > 0 then + table.insert(expected, v6) + funcs.serverstart(v6) -- exists already; ignore + end eq(expected, funcs.serverlist()) clear_serverlist() -- cgit