aboutsummaryrefslogtreecommitdiff
path: root/test/functional/helpers.lua
diff options
context:
space:
mode:
authorThiago de Arruda <tpadilha84@gmail.com>2016-04-13 09:21:32 -0300
committerThiago de Arruda <tpadilha84@gmail.com>2016-04-13 09:21:32 -0300
commitc18d5917e3442162f20eb9e95ba4bcffbbd8408b (patch)
treeb85f5789efce5713b5e5f05b27fda6166afb17c3 /test/functional/helpers.lua
parent10a8bb02acabe2c3a0d7cd2e9d8462e0228769a1 (diff)
downloadrneovim-c18d5917e3442162f20eb9e95ba4bcffbbd8408b.tar.gz
rneovim-c18d5917e3442162f20eb9e95ba4bcffbbd8408b.tar.bz2
rneovim-c18d5917e3442162f20eb9e95ba4bcffbbd8408b.zip
Update lua client to 0.0.1-24
The new version of the lua client uses libmpack as a backend, and some test scripts had to be updated to reflect that.
Diffstat (limited to 'test/functional/helpers.lua')
-rw-r--r--test/functional/helpers.lua15
1 files changed, 5 insertions, 10 deletions
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 919e6e077b..a382641cff 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -1,9 +1,8 @@
require('coxpcall')
+NIL = require('mpack').NIL
local lfs = require('lfs')
local assert = require('luassert')
-local Loop = require('nvim.loop')
-local MsgpackStream = require('nvim.msgpack_stream')
-local AsyncSession = require('nvim.async_session')
+local ChildProcessStream = require('nvim.child_process_stream')
local Session = require('nvim.session')
local nvim_prog = os.getenv('NVIM_PROG') or 'build/bin/nvim'
@@ -60,7 +59,7 @@ local session, loop_running, last_error
local function set_session(s)
if session then
- session:exit(0)
+ session:close()
end
session = s
end
@@ -212,12 +211,8 @@ local function merge_args(...)
end
local function spawn(argv, merge)
- local loop = Loop.new()
- local msgpack_stream = MsgpackStream.new(loop)
- local async_session = AsyncSession.new(msgpack_stream)
- local sess = Session.new(async_session)
- loop:spawn(merge and merge_args(prepend_argv, argv) or argv)
- return sess
+ local child_stream = ChildProcessStream.spawn(merge and merge_args(prepend_argv, argv) or argv)
+ return Session.new(child_stream)
end
local function clear(extra_cmd)