From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 6 Apr 2018 18:22:06 +0000 (+0200)
Subject: patch 8.0.1667: terminal window tests are flaky
X-Git-Tag: v8.0.1667
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3680bab7e797444a7f41646888d9dd04b01c3816;p=vim

patch 8.0.1667: terminal window tests are flaky

Problem:    Terminal window tests are flaky.
Solution:   Increase the waiting time for Vim to start.
---

diff --git a/src/testdir/screendump.vim b/src/testdir/screendump.vim
index d4fae0742..764345a98 100644
--- a/src/testdir/screendump.vim
+++ b/src/testdir/screendump.vim
@@ -59,8 +59,9 @@ func RunVimInTerminal(arguments, options)
   let buf = term_start(cmd, {'curwin': 1, 'term_rows': rows, 'term_cols': cols})
   call assert_equal([rows, cols], term_getsize(buf))
 
-  " Wait for the ruler (in the status line) to be shown.
-  call WaitFor({-> len(term_getline(buf, rows)) >= cols - 1})
+  " Wait for "All" of the ruler in the status line to be shown.
+  " This can be quite slow (e.g. when using valgrind), wait up to 4 seconds.
+  call WaitFor({-> len(term_getline(buf, rows)) >= cols - 1}, 4000)
 
   return buf
 endfunc
diff --git a/src/version.c b/src/version.c
index 44fb030fc..c625b05c1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1667,
 /**/
     1666,
 /**/