Skip to content

Commit f204e05

Browse files
committed
patch 8.0.1219: terminal test is flaky
Problem: Terminal test is flaky. Solution: Add test function to list of flaky tests.
1 parent 8d84ff1 commit f204e05

2 files changed

Lines changed: 17 additions & 7 deletions

File tree

src/testdir/runtest.vim

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,21 @@ func RunTheTest(test)
109109

110110
call add(s:messages, 'Executing ' . a:test)
111111
let s:done += 1
112-
try
112+
113+
if a:test =~ 'Test_nocatch_'
114+
" Function handles errors itself. This avoids skipping commands after the
115+
" error.
113116
exe 'call ' . a:test
114-
catch /^\cskipped/
115-
call add(s:messages, ' Skipped')
116-
call add(s:skipped, 'SKIPPED ' . a:test . ': ' . substitute(v:exception, '^\S*\s\+', '', ''))
117-
catch
118-
call add(v:errors, 'Caught exception in ' . a:test . ': ' . v:exception . ' @ ' . v:throwpoint)
119-
endtry
117+
else
118+
try
119+
exe 'call ' . a:test
120+
catch /^\cskipped/
121+
call add(s:messages, ' Skipped')
122+
call add(s:skipped, 'SKIPPED ' . a:test . ': ' . substitute(v:exception, '^\S*\s\+', '', ''))
123+
catch
124+
call add(v:errors, 'Caught exception in ' . a:test . ': ' . v:exception . ' @ ' . v:throwpoint)
125+
endtry
126+
endif
120127

121128
if exists("*TearDown")
122129
try
@@ -233,6 +240,7 @@ let s:flaky = [
233240
\ 'Test_quoteplus()',
234241
\ 'Test_quotestar()',
235242
\ 'Test_reltime()',
243+
\ 'Test_terminal_composing_unicode()',
236244
\ 'Test_terminal_noblock()',
237245
\ 'Test_with_partial_callback()',
238246
\ ]

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,8 @@ static char *(features[]) =
761761

762762
static int included_patches[] =
763763
{ /* Add new patch number below this line */
764+
/**/
765+
1219,
764766
/**/
765767
1218,
766768
/**/

0 commit comments

Comments
 (0)