patch 8.0.1219: terminal test is flaky
Problem: Terminal test is flaky.
Solution: Add test function to list of flaky tests.
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 245b51c..ae45a3e 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -109,14 +109,21 @@
call add(s:messages, 'Executing ' . a:test)
let s:done += 1
- try
+
+ if a:test =~ 'Test_nocatch_'
+ " Function handles errors itself. This avoids skipping commands after the
+ " error.
exe 'call ' . a:test
- catch /^\cskipped/
- call add(s:messages, ' Skipped')
- call add(s:skipped, 'SKIPPED ' . a:test . ': ' . substitute(v:exception, '^\S*\s\+', '', ''))
- catch
- call add(v:errors, 'Caught exception in ' . a:test . ': ' . v:exception . ' @ ' . v:throwpoint)
- endtry
+ else
+ try
+ exe 'call ' . a:test
+ catch /^\cskipped/
+ call add(s:messages, ' Skipped')
+ call add(s:skipped, 'SKIPPED ' . a:test . ': ' . substitute(v:exception, '^\S*\s\+', '', ''))
+ catch
+ call add(v:errors, 'Caught exception in ' . a:test . ': ' . v:exception . ' @ ' . v:throwpoint)
+ endtry
+ endif
if exists("*TearDown")
try
@@ -233,6 +240,7 @@
\ 'Test_quoteplus()',
\ 'Test_quotestar()',
\ 'Test_reltime()',
+ \ 'Test_terminal_composing_unicode()',
\ 'Test_terminal_noblock()',
\ 'Test_with_partial_callback()',
\ ]
diff --git a/src/version.c b/src/version.c
index 1c48ef4..7f72146 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1219,
+/**/
1218,
/**/
1217,