From aed19a7c5f148155672a2f87026d80fbde30a13f Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Fri, 20 Feb 2015 20:38:42 -0300 Subject: test: Remove -g flag from pynvim call in Screen.debug The flag is no longer valid(pynvim always starts a GUI) --- test/functional/ui/screen.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua index a20907791b..02841c98a0 100644 --- a/test/functional/ui/screen.lua +++ b/test/functional/ui/screen.lua @@ -135,7 +135,7 @@ Screen.colors = colors function Screen.debug(command) if not command then - command = 'pynvim -n -g -c ' + command = 'pynvim -n -c ' end command = command .. request('vim_eval', '$NVIM_LISTEN_ADDRESS') if debug_screen then -- cgit From a21d952bdd3f7addb8d3586247722944522b1a32 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Fri, 20 Feb 2015 20:40:02 -0300 Subject: test: Remove temporary files created by 072_undo_file_spec.lua --- test/functional/legacy/072_undo_file_spec.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/functional/legacy/072_undo_file_spec.lua b/test/functional/legacy/072_undo_file_spec.lua index 0e2cc6a84e..b7f7a65b30 100644 --- a/test/functional/legacy/072_undo_file_spec.lua +++ b/test/functional/legacy/072_undo_file_spec.lua @@ -96,6 +96,8 @@ describe('72', function() end) teardown(function() - os.remove('.Xtestfile.un~') + os.remove('Xtestfile') + os.remove('test.out') + os.remove('.Xtestfile.un~') end) end) -- cgit From f9d327c88bd6dc8194398e9298c3574bac0c5398 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Fri, 20 Feb 2015 20:41:03 -0300 Subject: test: Add extra screen expectation to prevent race condition This is to ensure ctrl+c is only pressed after the command has started executing in the viml_system_spec.lua system() interrupt test. --- test/functional/shell/viml_system_spec.lua | 34 +++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/test/functional/shell/viml_system_spec.lua b/test/functional/shell/viml_system_spec.lua index 85c055d3be..75e9de6aa9 100644 --- a/test/functional/shell/viml_system_spec.lua +++ b/test/functional/shell/viml_system_spec.lua @@ -79,6 +79,22 @@ describe('system()', function() it('`yes` and is interrupted with CTRL-C', function() feed(':call system("yes")') + screen:expect([[ + | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ^call system("yes") | + ]]) feed('') screen:expect([[ ^ | @@ -227,8 +243,24 @@ describe('systemlist()', function() ]]) end) - it('`yes` and is a little bit later interrupted with CTRL-C', function() + it('`yes` and is interrupted with CTRL-C', function() feed(':call systemlist("yes | xargs")') + screen:expect([[ + | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ^call systemlist("yes | xargs") | + ]]) feed('') screen:expect([[ ^ | -- cgit