summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-12-17 22:27:38 +0100
committerBram Moolenaar <Bram@vim.org>2020-12-17 22:27:38 +0100
commit0353f56ddb379e7f1a68172fa4743355e04df21e (patch)
tree5cc4a0ef859673e6b8a7b2f5484b881ed4fe9fdd
parentb125b535bb0456ab43c10683307a4bc359442d44 (diff)
downloadvim-git-8.2.2154.tar.gz
patch 8.2.2154: popupwin test for terminal buffer fails sometimesv8.2.2154
Problem: Popupwin test for terminal buffer fails sometimes. Solution: Wait for the prompt to appear.
-rw-r--r--src/testdir/test_popupwin.vim7
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index ca7c6a917..a36e0f599 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -2673,13 +2673,14 @@ func Test_popupwin_terminal_buffer()
let termbuf = term_start(&shell, #{hidden: 1})
let winid = popup_create(termbuf, #{minwidth: 40, minheight: 10, border: []})
- " Wait for shell to start and show a prompt
+ " Wait for shell to start
call WaitForAssert({-> assert_equal("run", job_status(term_getjob(termbuf)))})
- sleep 20m
+ " Wait for a prompt (see border char first, then space after prompt)
+ call WaitForAssert({ -> assert_equal(' ', screenstring(screenrow(), screencol() - 1))})
" When typing a character, the cursor is after it.
call feedkeys("x", 'xt')
- sleep 10m
+ call term_wait(termbuf)
redraw
call WaitForAssert({ -> assert_equal('x', screenstring(screenrow(), screencol() - 1))})
call feedkeys("\<BS>", 'xt')
diff --git a/src/version.c b/src/version.c
index 2bb336e0b..bd2fd5d98 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 */
/**/
+ 2154,
+/**/
2153,
/**/
2152,