Mercurial > vim
changeset 22780:2e681033d766 v8.2.1938
patch 8.2.1938: wiping out a terminal buffer makes some tests fail
Commit: https://github.com/vim/vim/commit/a46765a79745ff27b4a44659fb8389519c961977
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Nov 1 20:58:26 2020 +0100
patch 8.2.1938: wiping out a terminal buffer makes some tests fail
Problem: Wiping out a terminal buffer makes some tests fail.
Solution: Do not wipe out the terminal buffer unless wanted.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 01 Nov 2020 21:00:05 +0100 |
parents | b90c404c6c1a |
children | d67c6dd3d99b |
files | src/testdir/term_util.vim src/testdir/test_terminal.vim src/testdir/test_terminal3.vim src/version.c |
diffstat | 4 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/term_util.vim +++ b/src/testdir/term_util.vim @@ -134,7 +134,7 @@ func RunVimInTerminal(arguments, options endfunc " Stop a Vim running in terminal buffer "buf". -func StopVimInTerminal(buf) +func StopVimInTerminal(buf, kill = 1) " Using a terminal to run Vim is always considered flaky. let g:test_is_flaky = 1 @@ -151,7 +151,7 @@ func StopVimInTerminal(buf) call WaitForAssert({-> assert_equal("finished", term_getstatus(a:buf))}) " If the buffer still exists forcefully wipe it. - if bufexists(a:buf) + if a:kill && bufexists(a:buf) exe a:buf .. 'bwipe!' endif endfunc
--- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1230,7 +1230,7 @@ func Test_terminal_dumpwrite_errors() call assert_fails("call term_dumpwrite(buf, '')", 'E482:') call assert_fails("call term_dumpwrite(buf, test_null_string())", 'E482:') call test_garbagecollect_now() - call StopVimInTerminal(buf) + call StopVimInTerminal(buf, 0) call TermWait(buf) call assert_fails("call term_dumpwrite(buf, 'Xtest.dump')", 'E958:') call assert_fails('call term_sendkeys([], ":q\<CR>")', 'E745:')