summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-11-16 21:10:34 +0100
committerBram Moolenaar <Bram@vim.org>2020-11-16 21:10:34 +0100
commite6329e4c55cd81b6134820eab6a10b02c11c1277 (patch)
treea555d36a93ea1a9db821eee15407d371f7116267
parent27f4f6baeeb25e1597a7827f4a509ecf2eb8e6e2 (diff)
downloadvim-git-e6329e4c55cd81b6134820eab6a10b02c11c1277.tar.gz
patch 8.2.1999: terminal popup test sometimes failsv8.2.1999
Problem: Terminal popup test sometimes fails. Solution: Wait for the popup to close.
-rw-r--r--src/testdir/test_terminal.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 846ec5986..ee0e74344 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1249,8 +1249,8 @@ func Test_terminal_popup_bufload()
" must not have switched to another window
call assert_equal(winid, win_getid())
- call feedkeys("exit\<CR>", 'xt')
- sleep 50m
+ call StopShellInTerminal(termbuf)
+ call WaitFor({-> win_getid() != winid})
exe 'bwipe! ' .. newbuf
endfunc
diff --git a/src/version.c b/src/version.c
index 186bbdea6..ec1abe688 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1999,
+/**/
1998,
/**/
1997,