commit 999224422633935eaa8b804ce3d1c2f9ca195d0a
author Bram Moolenaar <Bram@vim.org> Mon Jul 08 20:58:25 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Jul 08 20:58:25 2019 +0200
tree d8c9852e06c0b13a7fe9a0b46b957c25e7a74101
parent ee9e604124682b0cd89e4f987a2f6f3fe4160920

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)

src/testdir/test_suspend.vim

diff --git a/src/testdir/test_suspend.vim b/src/testdir/test_suspend.vim
index 8b326f5..4b3bd5e 100644
--- a/src/testdir/test_suspend.vim
+++ b/src/testdir/test_suspend.vim
@@ -54,6 +54,8 @@
   " 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!'

src/version.c

diff --git a/src/version.c b/src/version.c
index 6ad4882..cbfee04 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1651,
+/**/
     1650,
 /**/
     1649,