summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-09-08 22:09:52 +0200
committerBram Moolenaar <Bram@vim.org>2019-09-08 22:09:52 +0200
commitb9c79cf5cc876ba4d46d938ad4a15800dbe45e64 (patch)
treed1921d6172c3bdf210423c98c40513bb39e2aa3f
parentf92e58cadb03156879e9bdbf6341bf662d9c87cc (diff)
downloadvim-git-8.1.2014.tar.gz
patch 8.1.2014: terminal altscreen test fails sometimesv8.1.2014
Problem: Terminal altscreen test fails sometimes. Solution: Use WaitFor().
-rw-r--r--src/testdir/test_terminal.vim7
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 4 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 48efd36f1..82459f85d 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -2093,11 +2093,10 @@ func Test_terminal_altscreen()
let buf = term_start(&shell, {})
call term_sendkeys(buf, 'echo "\e[?1047h"' .. "\r")
- call term_wait(buf)
- call assert_equal(1, term_getaltscreen(buf))
+ call WaitForAssert({-> assert_equal(1, term_getaltscreen(buf))})
+
call term_sendkeys(buf, 'echo "\e[?1047l"' .. "\r")
- call term_wait(buf)
- call assert_equal(0, buf->term_getaltscreen())
+ call WaitForAssert({-> assert_equal(0, term_getaltscreen(buf))})
call term_sendkeys(buf, "exit\r")
exe buf . "bwipe!"
diff --git a/src/version.c b/src/version.c
index d86f9f56d..448407fdf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2014,
+/**/
2013,
/**/
2012,