changeset 12431:4ae1485b5834 v8.0.1095

patch 8.0.1095: terminal multibyte escrape test is flaky commit https://github.com/vim/vim/commit/a038cb5eab24a9c395861694d9b8f610ec0ccb61 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Sep 11 20:45:23 2017 +0200 patch 8.0.1095: terminal multibyte escrape test is flaky Problem: Terminal multibyte escrape test is flaky. Solution: Add another condition to wait for.
author Christian Brabandt <cb@256bit.org>
date Mon, 11 Sep 2017 21:00:04 +0200
parents c314b7cde144
children e635ff0a804f
files src/testdir/test_terminal.vim src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -197,7 +197,7 @@ func Test_terminal_scrape_multibyte()
     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)
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1095,
+/**/
     1094,
 /**/
     1093,