aboutsummaryrefslogtreecommitdiff
path: root/test/functional/eval/server_spec.lua
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2017-11-02 05:45:38 -0400
committerJustin M. Keyes <justinkz@gmail.com>2017-11-02 10:45:38 +0100
commita39c8b7ce30ddeed4329c28c42b1b699103dccab (patch)
tree10bed9f903432149405fb66d80e5f5411b4995ca /test/functional/eval/server_spec.lua
parent54b79f19d7c63e5a7673264665d95dac335ede2c (diff)
downloadrneovim-a39c8b7ce30ddeed4329c28c42b1b699103dccab.tar.gz
rneovim-a39c8b7ce30ddeed4329c28c42b1b699103dccab.tar.bz2
rneovim-a39c8b7ce30ddeed4329c28c42b1b699103dccab.zip
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().
Diffstat (limited to 'test/functional/eval/server_spec.lua')
-rw-r--r--test/functional/eval/server_spec.lua38
1 files changed, 24 insertions, 14 deletions
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()