Permalink
Browse files

patch 8.0.1219: terminal test is flaky

Problem:    Terminal test is flaky.
Solution:   Add test function to list of flaky tests.
  • Loading branch information...
brammool committed Oct 26, 2017
1 parent 8d84ff1 commit f204e05ae9f6bc5d922d14d457e16b590efbf3e5
Showing with 17 additions and 7 deletions.
  1. +15 −7 src/testdir/runtest.vim
  2. +2 −0 src/version.c
View
@@ -109,14 +109,21 @@ func RunTheTest(test)
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 @@ let s:flaky = [
\ 'Test_quoteplus()',
\ 'Test_quotestar()',
\ 'Test_reltime()',
\ 'Test_terminal_composing_unicode()',
\ 'Test_terminal_noblock()',
\ 'Test_with_partial_callback()',
\ ]
View
@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1219,
/**/
1218,
/**/

0 comments on commit f204e05

Please sign in to comment.