diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-07-04 14:00:55 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-07-04 14:00:55 +0200 |
| commit | 999db2346b61e6f6e6fde2d0b56f4646a46b727d (patch) | |
| tree | 8964a472642a9eefef3786805f476464b5d4b36a | |
| parent | 1d97efce0ce31ddf0dd4c1ae2228ef4caee6880c (diff) | |
patch 8.2.3098: popup window test is flaky on MS-Windows with GUIv8.2.3098
Problem: Popup window test is flaky on MS-Windows with GUI.
Solution: Skip the check in this situation.
| -rw-r--r-- | src/testdir/test_popupwin.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim index 8e02ef1f03..62e19fa5d2 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -1550,24 +1550,32 @@ func Test_popup_filter() redraw " e is consumed by the filter + let g:eaten = '' call feedkeys('e', 'xt') call assert_equal('e', g:eaten) call feedkeys("\<F9>", 'xt') call assert_equal("\<F9>", g:eaten) " 0 is ignored by the filter + let g:ignored = '' normal $ call assert_equal(9, getcurpos()[2]) call feedkeys('0', 'xt') call assert_equal('0', g:ignored) - normal! l - call assert_equal(2, getcurpos()[2]) + + if has('win32') && has('gui_running') + echo "FIXME: this check is very flaky on MS-Windows GUI, the cursor doesn't move" + else + call assert_equal(1, getcurpos()[2]) + endif " x closes the popup call feedkeys('x', 'xt') call assert_equal("\<F9>", g:eaten) call assert_equal(-1, winbufnr(winid)) + unlet g:eaten + unlet g:ignored delfunc MyPopupFilter call popup_clear() endfunc diff --git a/src/version.c b/src/version.c index f6d5758aca..8d391d331d 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3098, +/**/ 3097, /**/ 3096, |