summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-02-15 00:26:14 +0100
committerBram Moolenaar <Bram@vim.org>2019-02-15 00:26:14 +0100
commit7e841e3ce507d3c03175213d167692609028fdd9 (patch)
tree2cee8d9ae6f5d2aa27b35ad288b84150785f14a8
parentc3ef8966081c03ce989f72a1e477df3327ccb971 (diff)
patch 8.1.0924: terminal scrollback test still flakyv8.1.0924
Problem: Terminal scrollback test still flaky. Solution: Wait a bit longer before running the tail command.
-rw-r--r--src/testdir/test_terminal.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 4bac4f93c1..353bd54d01 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -311,9 +311,9 @@ func Test_terminal_postponed_scrollback()
call writefile(range(50), 'Xtext')
call writefile([
\ 'terminal',
- \ 'sleep 100m',
+ \ 'sleep 400m',
\ 'call feedkeys("tail -n 100 -f Xtext\<CR>", "xt")',
- \ 'sleep 100m',
+ \ 'sleep 200m',
\ 'call feedkeys("\<C-W>N", "xt")',
\ ], 'XTest_postponed')
let buf = RunVimInTerminal('-S XTest_postponed', {})
diff --git a/src/version.c b/src/version.c
index bb5e0e1dba..10715acbad 100644
--- a/src/version.c
+++ b/src/version.c
@@ -784,6 +784,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 924,
+/**/
923,
/**/
922,