patch 8.1.1651: suspend test is flaky on some systems

Problem:    Suspend test is flaky on some systems.
Solution:   Wait for the shell prompt to show. (Yee Cheng Chin, closes #4632)

diff --git a/src/testdir/test_suspend.vim b/src/testdir/test_suspend.vim
index 8b326f51f65718c8b4116e0ff5f9032cd503ee08..4b3bd5eadf525fef1a6e26aebd26c263b613cb37 100644 (file)
--- a/src/testdir/test_suspend.vim
+++ b/src/testdir/test_suspend.vim
@@ -54,6 +54,8 @@ func Test_suspend()
   " Quit gracefully to dump coverage information.
   call term_sendkeys(buf, ":qall!\<CR>")
   call term_wait(buf)
+  " Wait until Vim actually exited and shell shows a prompt
+  call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))})
   call StopShellInTerminal(buf)
 
   exe buf . 'bwipe!'

diff --git a/src/version.c b/src/version.c
index 6ad48828b7710c6ef8a5418f39594382045688db..cbfee049c8d8aabffcd917972fe3a27329369c51 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1651,
 /**/
     1650,
 /**/