diff options
| author | ZyX <kp-pav@yandex.ru> | 2015-10-23 15:56:38 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2015-10-23 15:56:51 +0300 |
| commit | e5537a935f1808da75bb5cbb68c066a67ae08064 (patch) | |
| tree | a3b81d9111797fcff3ae611d8747eb7577835cf3 | |
| parent | 6b17d35ff19a56171527b34364c88c820e1bcdc2 (diff) | |
| download | rneovim-e5537a935f1808da75bb5cbb68c066a67ae08064.tar.gz rneovim-e5537a935f1808da75bb5cbb68c066a67ae08064.tar.bz2 rneovim-e5537a935f1808da75bb5cbb68c066a67ae08064.zip | |
functests: Fix tests
| -rw-r--r-- | test/functional/api/server_requests_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/ex_cmds/recover_spec.lua | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/functional/api/server_requests_spec.lua b/test/functional/api/server_requests_spec.lua index bc0c7f73d1..4c7122a549 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', '-i', 'NONE', '--embed'])") + nvim('command', "let vim = rpcstart('"..nvim_prog.."', ['-u', 'NONE', '-i', 'NONE', '--cmd', 'set noswapfile', '--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 a2e0978e63..6749cfaf40 100644 --- a/test/functional/ex_cmds/recover_spec.lua +++ b/test/functional/ex_cmds/recover_spec.lua @@ -29,9 +29,11 @@ describe(':preserve', function() it("saves to custom 'directory' and (R)ecovers (issue #1836)", function() local testfile = 'testfile_recover_spec' + -- Note: `set swapfile` *must* go after `set directory`: otherwise it may + -- attempt to create a swapfile in different directory. local init = [[ - set swapfile fileformat=unix undolevels=-1 set directory^=]]..swapdir..[[// + set swapfile fileformat=unix undolevels=-1 ]] source(init) |