patch 8.2.0444: swap file test fails on some systems

Problem:    Swap file test fails on some systems.
Solution:   Preserve the swap file. Send NL terminated keys.

diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim
index cc452c3a7ad05674e9192a68b1224a04aba7fb60..612832c9660f06e8361b80b5a552a4736f30d7ee 100644 (file)
--- a/src/testdir/test_swap.vim
+++ b/src/testdir/test_swap.vim
@@ -1,5 +1,6 @@
 " Tests for the swap feature
 
+source check.vim
 source shared.vim
 source term_util.vim
 
@@ -352,11 +353,12 @@ endfunc
 
 " Test for selecting 'q' in the attention prompt
 func Test_swap_prompt_splitwin()
-  if !CanRunVimInTerminal()
-    throw 'Skipped: cannot run vim in terminal'
-  endif
+  CheckRunVimInTerminal
+
   call writefile(['foo bar'], 'Xfile1')
   edit Xfile1
+  preserve  " should help to make sure the swap file exists
+
   let buf = RunVimInTerminal('', {'rows': 20})
   call term_sendkeys(buf, ":set nomore\n")
   call term_sendkeys(buf, ":set noruler\n")
@@ -365,9 +367,9 @@ func Test_swap_prompt_splitwin()
   call WaitForAssert({-> assert_match('^\[O\]pen Read-Only, (E)dit anyway, (R)ecover, (Q)uit, (A)bort: $', term_getline(buf, 20))})
   call term_sendkeys(buf, "q")
   call term_wait(buf)
-  call term_sendkeys(buf, ":")
+  call term_sendkeys(buf, ":\<CR>")
   call WaitForAssert({-> assert_match('^:$', term_getline(buf, 20))})
-  call term_sendkeys(buf, "echomsg winnr('$')\<CR>")
+  call term_sendkeys(buf, ":echomsg winnr('$')\<CR>")
   call term_wait(buf)
   call WaitForAssert({-> assert_match('^1$', term_getline(buf, 20))})
   call StopVimInTerminal(buf)

diff --git a/src/version.c b/src/version.c
index 2e219a9a6fc91fb8505f9f281c72cd3f4f5ba4ea..4230f545ed7db00ee7419728eb643a0f2ab5e642 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    444,
 /**/
     443,
 /**/