summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-09-23 18:22:21 +0100
committerBram Moolenaar <Bram@vim.org>2022-09-23 18:22:21 +0100
commit4ecf16bbf951f10fd32c918c9d8bc004b7f8f7c9 (patch)
tree11e710c5e15453787182621ab2a68098efe4086d
parent7f9a5a68fe363db467a505502237c1e8479c1436 (diff)
patch 9.0.0559: timer test may get stuck at hit-enter promptv9.0.0559
Problem: Timer test may get stuck at hit-enter prompt. Solution: Feed some more characters.
-rw-r--r--src/testdir/test_timers.vim6
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index 2625013ae4..de72c78db0 100644
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -379,11 +379,13 @@ func Test_nocatch_timer_garbage_collect()
let a = {'foo', 'bar'}
endfunc
func FeedChar(id)
- call feedkeys('x', 't')
+ call feedkeys(":\<CR>", 't')
endfunc
call timer_start(300, 'FeedChar')
call timer_start(100, 'CauseAnError')
- let x = getchar()
+ let x = getchar() " wait for error in timer
+ let x = getchar(0) " read any remaining chars
+ let x = getchar(0)
set ut&
call test_override('no_wait_return', 1)
diff --git a/src/version.c b/src/version.c
index 48f2ca559b..7b4e24f953 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 559,
+/**/
558,
/**/
557,