summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-03-23 16:25:09 +0100
committerBram Moolenaar <Bram@vim.org>2021-03-23 16:25:09 +0100
commitf4a2ed071447ad4984fad55b9d1671b55140ae1c (patch)
tree006290cdf1d6535d9f00d4880a058c9ea3a89c8e
parentf28f2ac425600b88da0bdcc12a82cd620f575681 (diff)
patch 8.2.2647: terminal test sometimes hangsv8.2.2647
Problem: Terminal test sometimes hangs. Solution: Wait for the shell to display a prompt.
-rw-r--r--src/testdir/test_terminal.vim2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 3def03d7b2..a82ad8c52b 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -889,6 +889,8 @@ endfunc
func TerminalTmap(remap)
let buf = Run_shell_in_terminal({})
+ " Wait for the shell to display a prompt
+ call WaitForAssert({-> assert_notequal('', term_getline(buf, 1))})
call assert_equal('t', mode())
if a:remap
diff --git a/src/version.c b/src/version.c
index b8b5d58a9a..750db2ef6e 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 */
/**/
+ 2647,
+/**/
2646,
/**/
2645,