# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1506775504 -7200
# Node ID 871dc52ee7d7dc1d4ae69e7173e80b7d0ab9e2d0
# Parent  0f4720c58aa4a1ecf933b0f8720a1471fdf37129
patch 8.0.1163: popup test is flaky

commit https://github.com/vim/vim/commit/c79977a437d91306d576fb59e490601409503303
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Sep 30 14:39:27 2017 +0200

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1163,
+/**/
     1162,
 /**/
     1161,