diff options
author | ZyX <kp-pav@yandex.ru> | 2015-10-23 15:09:07 +0300 |
---|---|---|
committer | ZyX <kp-pav@yandex.ru> | 2015-10-23 15:56:51 +0300 |
commit | ec1ca54d59e229d89bfae6e6eb9e311fa6cb329e (patch) | |
tree | 6a2d8c0bb8b94bd764ec22343eebc6473083589d | |
parent | ca6235c20f4ac53cdc9f87857b6221a2841fe10e (diff) | |
download | rneovim-ec1ca54d59e229d89bfae6e6eb9e311fa6cb329e.tar.gz rneovim-ec1ca54d59e229d89bfae6e6eb9e311fa6cb329e.tar.bz2 rneovim-ec1ca54d59e229d89bfae6e6eb9e311fa6cb329e.zip |
functests: Do not forget about -i argument
Target: make all tests run with chmod -x ~/.config/nvim ~/.local/share/nvim.
-rw-r--r-- | test/functional/api/server_requests_spec.lua | 2 | ||||
-rw-r--r-- | test/functional/ex_cmds/recover_spec.lua | 2 | ||||
-rw-r--r-- | test/functional/ex_cmds/wviminfo_spec.lua | 2 | ||||
-rw-r--r-- | test/functional/terminal/tui_spec.lua | 2 | ||||
-rw-r--r-- | test/functional/ui/screen.lua | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/test/functional/api/server_requests_spec.lua b/test/functional/api/server_requests_spec.lua index 34bf4b5ace..bc0c7f73d1 100644 --- a/test/functional/api/server_requests_spec.lua +++ b/test/functional/api/server_requests_spec.lua @@ -118,7 +118,7 @@ describe('server -> client', function() describe('when the client is a recursive vim instance', function() before_each(function() - nvim('command', "let vim = rpcstart('"..nvim_prog.."', ['-u', 'NONE', '--embed'])") + nvim('command', "let vim = rpcstart('"..nvim_prog.."', ['-u', 'NONE', '-i', 'NONE', '--embed'])") neq(0, eval('vim')) end) diff --git a/test/functional/ex_cmds/recover_spec.lua b/test/functional/ex_cmds/recover_spec.lua index a24a60af81..a2e0978e63 100644 --- a/test/functional/ex_cmds/recover_spec.lua +++ b/test/functional/ex_cmds/recover_spec.lua @@ -47,7 +47,7 @@ describe(':preserve', function() --TODO(justinmk): this is an ugly hack to force `helpers` to support --multiple sessions. - local nvim2 = helpers.spawn({helpers.nvim_prog, '-u', 'NONE', '--embed'}, + local nvim2 = helpers.spawn({helpers.nvim_prog, '-u', 'NONE', '-i', 'NONE', '--embed'}, true) helpers.set_session(nvim2) diff --git a/test/functional/ex_cmds/wviminfo_spec.lua b/test/functional/ex_cmds/wviminfo_spec.lua index 0c85157a0f..b6b9185cf2 100644 --- a/test/functional/ex_cmds/wviminfo_spec.lua +++ b/test/functional/ex_cmds/wviminfo_spec.lua @@ -13,7 +13,7 @@ describe(':wshada', function() end -- Override the default session because we need 'swapfile' for these tests. - local session = spawn({nvim_prog, '-u', 'NONE', '--embed', + local session = spawn({nvim_prog, '-u', 'NONE', '-i', '/dev/null', '--embed', '--cmd', 'set swapfile'}) set_session(session) diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua index d604703fee..5ec087645f 100644 --- a/test/functional/terminal/tui_spec.lua +++ b/test/functional/terminal/tui_spec.lua @@ -11,7 +11,7 @@ describe('tui', function() before_each(function() helpers.clear() - screen = thelpers.screen_setup(0, '["'..helpers.nvim_prog..'", "-u", "NONE", "--cmd", "set noswapfile"]') + screen = thelpers.screen_setup(0, '["'..helpers.nvim_prog..'", "-u", "NONE", "-i", "NONE", "--cmd", "set noswapfile"]') screen.timeout = 30000 -- pasting can be really slow in the TUI screen:expect([[ {1: } | diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua index 1be83d745e..c767f9b83a 100644 --- a/test/functional/ui/screen.lua +++ b/test/functional/ui/screen.lua @@ -125,7 +125,7 @@ end do local spawn, nvim_prog = helpers.spawn, helpers.nvim_prog - local session = spawn({nvim_prog, '-u', 'NONE', '-N', '--embed'}) + local session = spawn({nvim_prog, '-u', 'NONE', '-i', 'NONE', '-N', '--embed'}) local status, rv = session:request('vim_get_color_map') if not status then print('failed to get color map') |