summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-09-05 20:19:42 +0200
committerBram Moolenaar <Bram@vim.org>2017-09-05 20:19:42 +0200
commit1bfdc07a4996b5905b4971e18a6487a18e6461a4 (patch)
tree97f533eea00b0fa9f86ecfcad9edfe1e3f3b8352
parent6e32f615eb824048a98666d1da4416bbeb7b2bed (diff)
patch 8.0.1057: terminal scrape test waits too longv8.0.1057
Problem: Terminal scrape test waits too long, it checks for one instead of three. Solution: Check there are three characters. (micbou)
-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 c7ff89ee67..2ee25bf7c7 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -166,8 +166,8 @@ func Test_terminal_scrape_123()
call term_wait(buf)
let g:buf = buf
" On MS-Windows we first get a startup message of two lines, wait for the
- " "cls" to happen, after that we have one line.
- call WaitFor('len(term_scrape(g:buf, 1)) == 1')
+ " "cls" to happen, after that we have one line with three characters.
+ call WaitFor('len(term_scrape(g:buf, 1)) == 3')
call Check_123(buf)
" Must still work after the job ended.
diff --git a/src/version.c b/src/version.c
index 652704c1b7..8fa740d784 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1057,
+/**/
1056,
/**/
1055,