patch 8.2.1999: terminal popup test sometimes fails

Problem:    Terminal popup test sometimes fails.
Solution:   Wait for the popup to close.

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 846ec5986eb32d8356753ce2e6ab1711f63c1036..ee0e743440a942b3b81a16658e64a3b56501a3ae 100644 (file)
--- 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 186bbdea63496de8fd847157d2381217c085dfbb..ec1abe68854e53691a82483ca30effa1fa8fbec3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1999,
 /**/
     1998,
 /**/