diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-30 14:39:27 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-30 14:39:27 +0200 |
| commit | c79977a437d91306d576fb59e490601409503303 (patch) | |
| tree | 12b331fec005adb90ca6b109676e6ef185db221f | |
| parent | 660b85e39a48a9f2e3bd7e4d8b97d0a1b4842997 (diff) | |
| download | vim-git-c79977a437d91306d576fb59e490601409503303.tar.gz | |
patch 8.0.1163: popup test is flakyv8.0.1163
Problem: Popup test is flaky.
Solution: Add a WaitFor() and fix another.
| -rw-r--r-- | src/testdir/test_popup.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
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, "\<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 index 778046b95..dc9be43c5 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 */ /**/ + 1163, +/**/ 1162, /**/ 1161, |