summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-04-10 21:43:26 +0200
committerBram Moolenaar <Bram@vim.org>2018-04-10 21:43:26 +0200
commitb377457e693210d1b0c0bbac7e04671fc98f038b (patch)
tree8846ddb37292d5613a4c42c36065925b7131edb6
parent1acdb3f30104576c36f83d422fb67a805b0ce58a (diff)
downloadvim-git-b377457e693210d1b0c0bbac7e04671fc98f038b.tar.gz
patch 8.0.1694: terminal API test is a bit flakyv8.0.1694
Problem: Terminal API test is a bit flaky. Solution: Wait longer for Vim to stop.
-rw-r--r--src/testdir/screendump.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim
index 764345a98..e1e660b37 100644
--- a/src/testdir/screendump.vim
+++ b/src/testdir/screendump.vim
@@ -70,7 +70,7 @@ endfunc
func StopVimInTerminal(buf)
call assert_equal("running", term_getstatus(a:buf))
call term_sendkeys(a:buf, "\<Esc>\<Esc>:qa!\<cr>")
- call WaitFor('term_getstatus(' . a:buf . ') == "finished"')
+ call WaitFor('term_getstatus(' . a:buf . ') == "finished"', 3000)
only!
endfunc
diff --git a/src/version.c b/src/version.c
index 80b05fa0f..46d12cc8c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1694,
+/**/
1693,
/**/
1692,