# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1506783604 -7200
# Node ID 575d530df0534a33a1197475776b95c4ca17a8ed
# Parent  e71f6b9fe5659ad37922f2ac5ea11434ea04a311
patch 8.0.1165: popup test is still flaky

commit https://github.com/vim/vim/commit/f52c38315669f85bbcf3bd74c590148bf588f6c6
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Sep 30 16:49:19 2017 +0200

    patch 8.0.1165: popup test is still flaky

    Problem:    Popup test is still flaky.
    Solution:   Add a term_wait() call. (Ozaki Kiichi)

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
@@ -645,20 +645,26 @@ func Test_popup_and_window_resize()
   endif
   let g:buf = term_start([$VIMPROG, '--clean', '-c', 'set noswapfile'], {'term_rows': h / 3})
   call term_sendkeys(g:buf, (h / 3 - 1)."o\<esc>G")
+  call term_wait(g:buf, 100)
   call term_sendkeys(g:buf, "i\<c-x>")
   call term_wait(g:buf, 100)
   call term_sendkeys(g:buf, "\<c-v>")
   call term_wait(g:buf, 100)
+  " popup first entry "!" must be at the top
   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!
+  " popup shifted down, first line is now empty
   call WaitFor('term_getline(g:buf, 1) == ""')
   call assert_equal('', term_getline(g:buf, 1))
   sleep 100m
+  " popup is below cursor line and shows first match "!"
   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))
+  " cursor line also shows !
+  call assert_match('^!\s*$', term_getline(g:buf, term_getcursor(g:buf)[0]))
   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 */
 /**/
+    1165,
+/**/
     1164,
 /**/
     1163,