summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-06-22 19:24:23 +0200
committerBram Moolenaar <Bram@vim.org>2020-06-22 19:24:23 +0200
commit373c65104e0991724cb57910dfb3e5c276e2d7e7 (patch)
tree30abc3e1593feab3f318efa2409d700adc3d952f
parent7633fe595e6a27d6bb376548ff89f0dcce481600 (diff)
patch 8.2.1036: popupwin test fails sometimesv8.2.1036
Problem: Popupwin test fails sometimes. Solution: Use WaitForAssert() instead of a sleep.
-rw-r--r--src/testdir/test_popupwin.vim4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 42f4256c3e..80a14595e0 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -2454,9 +2454,11 @@ func Test_popupwin_terminal_buffer()
call term_sendkeys(termbuf2, "exit\<CR>")
" Exiting shell closes popup window
+ let pupwin = win_getid()
call feedkeys("exit\<CR>", 'xt')
" Wait for shell to exit
- sleep 100m
+ call WaitForAssert({-> assert_notequal(pupwin, win_getid())})
+
call feedkeys(":quit\<CR>", 'xt')
call assert_equal(origwin, win_getid())
endfunc
diff --git a/src/version.c b/src/version.c
index 3c6b744b56..42c03d0922 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1036,
+/**/
1035,
/**/
1034,