diff options
| -rw-r--r-- | test/functional/helpers.lua | 6 | ||||
| -rw-r--r-- | test/functional/ui/screen.lua | 2 |
2 files changed, 4 insertions, 4 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) diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua index 29bbe69d8b..3070412e4d 100644 --- a/test/functional/ui/screen.lua +++ b/test/functional/ui/screen.lua @@ -192,7 +192,7 @@ function Screen:wait(check, timeout) err = check() end if err then - error(err) + assert(false, err) end end |