diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2015-02-21 04:47:45 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2015-02-21 04:47:45 -0300 |
| commit | 486d2e944dffb30d97d65c88bbcc77f6fd1208f6 (patch) | |
| tree | 6d8ec587b9c63a67fa368b48a7bfef342a924348 | |
| parent | d35820379f57c73e594a0c29713d64ef9e6ada22 (diff) | |
| parent | f9d327c88bd6dc8194398e9298c3574bac0c5398 (diff) | |
| download | rneovim-486d2e944dffb30d97d65c88bbcc77f6fd1208f6.tar.gz rneovim-486d2e944dffb30d97d65c88bbcc77f6fd1208f6.tar.bz2 rneovim-486d2e944dffb30d97d65c88bbcc77f6fd1208f6.zip | |
Merge PR #2032 'Some test fixes'
| -rw-r--r-- | test/functional/legacy/072_undo_file_spec.lua | 4 | ||||
| -rw-r--r-- | test/functional/shell/viml_system_spec.lua | 34 | ||||
| -rw-r--r-- | test/functional/ui/screen.lua | 2 |
3 files changed, 37 insertions, 3 deletions
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) 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")<cr>') + screen:expect([[ + | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ^call system("yes") | + ]]) feed('<c-c>') 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")<cr>') + screen:expect([[ + | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ~ | + ^call systemlist("yes | xargs") | + ]]) feed('<c-c>') screen:expect([[ ^ | 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 |