summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-12-13 22:17:44 +0000
committerBram Moolenaar <Bram@vim.org>2021-12-13 22:17:44 +0000
commit0407d270342d363c6297a7556cd904b4c434df54 (patch)
treede079469755f77286a24d20c2c64fa286955049a
parent3194e5bf87f8e08f519b947a03c46677616cd7e3 (diff)
downloadvim-git-8.2.3802.tar.gz
patch 8.2.3802: terminal in two windows test fails on some systemsv8.2.3802
Problem: Terminal in two windows test fails on some systems. Solution: Wait a bit between commands.
-rw-r--r--src/testdir/test_terminal.vim6
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 68013a3af..3e2a69106 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1378,7 +1378,7 @@ func Test_terminal_popup_bufload()
endfunc
func Test_terminal_popup_two_windows()
- CheckScreendump
+ CheckRunVimInTerminal
CheckUnix
" use "sh" instead of "&shell" in the hope it will use a short prompt
@@ -1398,7 +1398,9 @@ func Test_terminal_popup_two_windows()
call WaitForAssert({-> assert_match("echo 'test'", term_getline(buf, 1))})
call WaitForAssert({-> assert_match("echo 'test'", term_getline(buf, 3))})
- call term_sendkeys(buf, "\<CR>exit\<CR>:q\<CR>")
+ call term_sendkeys(buf, "\<CR>\<CR>exit\<CR>")
+ call TermWait(buf)
+ call term_sendkeys(buf, ":q\<CR>")
call StopVimInTerminal(buf)
call delete('XpopupScript')
endfunc
diff --git a/src/version.c b/src/version.c
index 8f0b95491..4181019c1 100644
--- 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 */
/**/
+ 3802,
+/**/
3801,
/**/
3800,