From a038cb5eab24a9c395861694d9b8f610ec0ccb61 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 11 Sep 2017 20:45:23 +0200 Subject: 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 | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index b4268f57b2..4596d9130c 100644 --- 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) diff --git a/src/version.c b/src/version.c index 013038816e..c970b57d84 100644 --- a/src/version.c +++ b/src/version.c @@ -769,6 +769,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1095, /**/ 1094, /**/ -- cgit v1.2.3