mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-11 17:12:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: server_spec: Tolerate missing protocol (#7478)

Browse Source 
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().
This commit is contained in:
James McCoy
2017-11-02 05:45:38 -04:00
committed by Justin M. Keyes
parent 54b79f19d7
commit a39c8b7ce3
2 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/functional/api/server_requests_spec.lua
View File

@@ -304,14 +304,30 @@ describe('server -> client', function()
connect_test(server, 'pipe', address) connect_test(server, 'pipe', address)
end) end)
it('via ip address', function() it('via ipv4 address', function()
local server = spawn(nvim_argv) local server = spawn(nvim_argv)
set_session(server) set_session(server)
local address = funcs.serverstart("127.0.0.1:") local address = funcs.serverstart("127.0.0.1:")
if #address == 0 then
pending('no ipv4 stack', function() end)
return
end
eq('127.0.0.1:', string.sub(address,1,10)) eq('127.0.0.1:', string.sub(address,1,10))
connect_test(server, 'tcp', address) connect_test(server, 'tcp', address)
end) end)
it('via ipv6 address', function()
local server = spawn(nvim_argv)
set_session(server)
local address = funcs.serverstart('::1:')
if #address == 0 then
pending('no ipv6 stack', function() end)
return
end
eq('::1:', string.sub(address,1,4))
connect_test(server, 'tcp', address)
end)
it('via hostname', function() it('via hostname', function()
local server = spawn(nvim_argv) local server = spawn(nvim_argv)
set_session(server) set_session(server)

38
test/functional/eval/server_spec.lua
View File

@@ -63,23 +63,33 @@ describe('serverstart(), serverstop()', function()
eq({}, funcs.serverlist()) eq({}, funcs.serverlist())
local s = funcs.serverstart('127.0.0.1:0') -- assign random port local s = funcs.serverstart('127.0.0.1:0') -- assign random port
assert(string.match(s, '127.0.0.1:%d+')) if #s > 0 then
eq(s, funcs.serverlist()[1]) assert(string.match(s, '127.0.0.1:%d+'))
clear_serverlist() eq(s, funcs.serverlist()[1])
clear_serverlist()
end
s = funcs.serverstart('127.0.0.1:') -- assign random port s = funcs.serverstart('127.0.0.1:') -- assign random port
assert(string.match(s, '127.0.0.1:%d+')) if #s > 0 then
eq(s, funcs.serverlist()[1]) assert(string.match(s, '127.0.0.1:%d+'))
clear_serverlist() eq(s, funcs.serverlist()[1])
clear_serverlist()
end
funcs.serverstart('127.0.0.1:12345') local expected = {}
funcs.serverstart('127.0.0.1:12345') -- exists already; ignore local v4 = '127.0.0.1:12345'
funcs.serverstart('::1:12345') s = funcs.serverstart(v4)
funcs.serverstart('::1:12345') -- exists already; ignore if #s > 0 then
local expected = { table.insert(expected, v4)
'127.0.0.1:12345', funcs.serverstart(v4) -- exists already; ignore
'::1:12345', 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()) eq(expected, funcs.serverlist())
clear_serverlist() clear_serverlist()