thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.1165: popup test is still flaky

Browse Source 
Problem:    Popup test is still flaky.
Solution:   Add a term_wait() call. (Ozaki Kiichi)
This commit is contained in:
Bram Moolenaar
2017-09-30 16:49:19 +02:00
parent 65ed136844
commit f52c383156
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/testdir/test_popup.vim
View File

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

2
src/version.c
View File

@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1165,
/**/ /**/
1164, 1164,
/**/ /**/