summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-10-01 16:59:18 +0200
committerBram Moolenaar <Bram@vim.org>2017-10-01 16:59:18 +0200
commit712549e04eddd6687c4b7654ec9af6da6c365603 (patch)
tree953c1b1baa445694f9a06b31ac6e144506b5e8b4
parentf33606112a59de6965692840b47d9cb4b924fc97 (diff)
patch 8.0.1171: popup test is still a bit flakyv8.0.1171
Problem: Popup test is still a bit flaky. Solution: Change term_wait() calls. (Ozaki Kiichi)
-rw-r--r--src/testdir/test_popup.vim3
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index 0dfa956fb2..fdd51de51c 100644
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -645,9 +645,8 @@ 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_wait(g:buf, 200)
call term_sendkeys(g:buf, "\<c-v>")
call term_wait(g:buf, 100)
" popup first entry "!" must be at the top
diff --git a/src/version.c b/src/version.c
index d809ba9780..925a6cd616 100644
--- 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 */
/**/
+ 1171,
+/**/
1170,
/**/
1169,