aboutsummaryrefslogtreecommitdiff
path: root/test/functional/helpers.lua
diff options
context:
space:
mode:
authorThiago de Arruda <tpadilha84@gmail.com>2015-01-23 19:36:11 -0300
committerThiago de Arruda <tpadilha84@gmail.com>2015-01-23 19:36:11 -0300
commitd84cbfa4dc8b6d1ba7b9c72ad7fb9c40e05ae1d9 (patch)
tree23d796c7703f53b9ea26377494b2a5fdb6677a24 /test/functional/helpers.lua
parent641df7be9cc8168399ea05d61f7009770880f28f (diff)
parentcbc23d93b9f8dd8043836fa2d0ca36667a19a849 (diff)
downloadrneovim-d84cbfa4dc8b6d1ba7b9c72ad7fb9c40e05ae1d9.tar.gz
rneovim-d84cbfa4dc8b6d1ba7b9c72ad7fb9c40e05ae1d9.tar.bz2
rneovim-d84cbfa4dc8b6d1ba7b9c72ad7fb9c40e05ae1d9.zip
Merge PR #1877 'Fix functional test suite hang when a test fails'
Diffstat (limited to 'test/functional/helpers.lua')
-rw-r--r--test/functional/helpers.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index c76979e894..ea98ff4ce3 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -6,7 +6,8 @@ local Session = require('nvim.session')
local nvim_prog = os.getenv('NVIM_PROG') or 'build/bin/nvim'
local nvim_argv = {nvim_prog, '-u', 'NONE', '-i', 'NONE', '-N',
- '--cmd', 'set shortmess+=I background=light', '--embed'}
+ '--cmd', 'set shortmess+=I background=light noswapfile',
+ '--embed'}
local prepend_argv
if os.getenv('VALGRIND') then
@@ -153,8 +154,7 @@ end
local function clear()
if session then
- session:request('vim_command', 'qa!')
- session:exit()
+ session:exit(0)
end
local loop = Loop.new()
local msgpack_stream = MsgpackStream.new(loop)