# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1604260805 -3600
# Node ID 2e681033d7668f1f0c666065b74b445dcc402a07
# Parent  b90c404c6c1a67f439973dad6bc53fb1cd39af61
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.

diff --git a/src/testdir/term_util.vim b/src/testdir/term_util.vim
--- 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
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
--- 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:')
diff --git a/src/testdir/test_terminal3.vim b/src/testdir/test_terminal3.vim
--- a/src/testdir/test_terminal3.vim
+++ b/src/testdir/test_terminal3.vim
@@ -560,7 +560,6 @@ func Test_terminal_getwinpos()
   call TermWait(buf)
   call term_sendkeys(buf, ":q\<CR>")
   call StopVimInTerminal(buf)
-  exe buf . 'bwipe!'
   set splitright&
   only!
 endfunc
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1938,
+/**/
     1937,
 /**/
     1936,