From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 1 Nov 2020 19:58:26 +0000 (+0100)
Subject: patch 8.2.1938: wiping out a terminal buffer makes some tests fail
X-Git-Tag: v8.2.1938
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a46765a79745ff27b4a44659fb8389519c961977;p=vim

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
index c2a2c350c..cfc850ba0 100644
--- 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
index 829706c93..f5b99bcc8 100644
--- 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
index a3b8c1c2b..db6ebc00f 100644
--- 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
index 65050b9a3..3cba21401 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1938,
 /**/
     1937,
 /**/