commit a038cb5eab24a9c395861694d9b8f610ec0ccb61
author Bram Moolenaar <Bram@vim.org> Mon Sep 11 20:45:23 2017 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Sep 11 20:45:23 2017 +0200
tree e9aab118ace1b0f7de4c7e3830f8f94a8a9381ad
parent c212798333cab2239acd387725987f27c6d8a3f7

patch 8.0.1095: terminal multibyte escrape test is flaky

Problem:    Terminal multibyte escrape test is flaky.
Solution:   Add another condition to wait for.

src/testdir/test_terminal.vim

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index b4268f5..4596d91 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -197,7 +197,7 @@
     let g:line = 1
   endif
 
-  call WaitFor('term_scrape(g:buf, g:line)[0].chars == "l"')
+  call WaitFor('len(term_scrape(g:buf, g:line)) >= 7 && term_scrape(g:buf, g:line)[0].chars == "l"')
   let l = term_scrape(g:buf, g:line)
   call assert_true(len(l) >= 7)
   call assert_equal('l', l[0].chars)

src/version.c

diff --git a/src/version.c b/src/version.c
index 0130388..c970b57 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1095,
+/**/
     1094,
 /**/
     1093,