From bec5fd5809afc6da52785e3007a467ec988d7d77 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Mon, 6 Jun 2016 21:54:35 -0400 Subject: test: functional: Remove test_bkc_* files after testing --- test/functional/ex_cmds/write_spec.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/functional/ex_cmds/write_spec.lua b/test/functional/ex_cmds/write_spec.lua index 83513d747f..7f5eba1fc8 100644 --- a/test/functional/ex_cmds/write_spec.lua +++ b/test/functional/ex_cmds/write_spec.lua @@ -6,10 +6,13 @@ local eq, eval, clear, write_file, execute, source = helpers.execute, helpers.source describe(':write', function() - it('&backupcopy=auto preserves symlinks', function() - clear('set backupcopy=auto') + after_each(function() os.remove('test_bkc_file.txt') os.remove('test_bkc_link.txt') + end) + + it('&backupcopy=auto preserves symlinks', function() + clear('set backupcopy=auto') write_file('test_bkc_file.txt', 'content0') execute("silent !ln -s test_bkc_file.txt test_bkc_link.txt") source([[ @@ -23,8 +26,6 @@ describe(':write', function() it('&backupcopy=no replaces symlink with new file', function() clear('set backupcopy=no') - os.remove('test_bkc_file.txt') - os.remove('test_bkc_link.txt') write_file('test_bkc_file.txt', 'content0') execute("silent !ln -s test_bkc_file.txt test_bkc_link.txt") source([[ -- cgit From d45a665b00e4c96f2f856f750b1148506aa31e2a Mon Sep 17 00:00:00 2001 From: James McCoy Date: Mon, 6 Jun 2016 22:01:55 -0400 Subject: test: functional: Remove unnecessary use of clipboard register menu_spec.lua yanks to the clipboard, but never pastes from it. This can leave a child xsel process waiting around for something to paste the content, causing the test process to hang. Since the test isn't explicitly trying to exercise the clipboard, simply use the default register. --- test/functional/ex_cmds/menu_spec.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/functional/ex_cmds/menu_spec.lua b/test/functional/ex_cmds/menu_spec.lua index 10bcc5b7bb..52df9e1592 100644 --- a/test/functional/ex_cmds/menu_spec.lua +++ b/test/functional/ex_cmds/menu_spec.lua @@ -39,7 +39,7 @@ describe(':emenu', function() end) it('executes correct bindings in command mode', function() - feed('ithis is a sentence^"+yiwo') + feed('ithis is a sentence^yiwo') -- Invoke "Edit.Paste" in normal-mode. nvim('command', 'emenu Edit.Paste') -- cgit