patch 8.0.1163: popup test is flaky

Problem:    Popup test is flaky.
Solution:   Add a WaitFor() and fix another.

diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index a42ec64a2ab80d82d2cee361da6d3f1396bc068b..4ab860b81338b2f4ef927613bf8714903f56dbd7 100644 (file)
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -649,14 +649,15 @@ func Test_popup_and_window_resize()
   call term_wait(g:buf, 100)
   call term_sendkeys(g:buf, "\<c-v>")
   call term_wait(g:buf, 100)
+  call WaitFor('term_getline(g:buf, 1) =~ "^!"')
   call assert_match('^!\s*$', term_getline(g:buf, 1))
   exe 'resize +' . (h - 1)
   call term_wait(g:buf, 100)
   redraw!
-  call WaitFor('"" == term_getline(g:buf, 1)')
+  call WaitFor('term_getline(g:buf, 1) == ""')
   call assert_equal('', term_getline(g:buf, 1))
   sleep 100m
-  call WaitFor('"^!" =~ term_getline(g:buf, term_getcursor(g:buf)[0] + 1)')
+  call WaitFor('term_getline(g:buf, term_getcursor(g:buf)[0] + 1) =~ "^!"')
   call assert_match('^!\s*$', term_getline(g:buf, term_getcursor(g:buf)[0] + 1))
   bwipe!
 endfunc

diff --git a/src/version.c b/src/version.c
index 778046b953cbf8a4747f2f3ca65ed07ada254ab1..dc9be43c53147e543e656a2196790eb5883a5015 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1163,
 /**/
     1162,
 /**/