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 d4fae0742512f13328e22bd96950409492972133..764345a98c7290cd4f36fc3bc041a9be59d1a047 100644 (file)
--- 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 44fb030fc96e4700825be8b658dd18812c8002aa..c625b05c163f8efa0f93159202676fed0b91e524 100644 (file)
--- 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,
 /**/