From: Bram Moolenaar Date: Sat, 30 Sep 2017 12:39:27 +0000 (+0200) Subject: patch 8.0.1163: popup test is flaky X-Git-Tag: v8.0.1163 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c79977a437d91306d576fb59e490601409503303;p=vim 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 a42ec64a2..4ab860b81 100644 --- 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, "\") 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 778046b95..dc9be43c5 100644 --- 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, /**/