diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-10-26 17:14:01 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-10-26 17:14:01 +0200 |
| commit | f204e05ae9f6bc5d922d14d457e16b590efbf3e5 (patch) | |
| tree | 21906232ca3c5709383fa4f63d62979bc1f95aed | |
| parent | 8d84ff1a3c8cfe59399d3f675ec080066582fdb6 (diff) | |
patch 8.0.1219: terminal test is flakyv8.0.1219
Problem: Terminal test is flaky.
Solution: Add test function to list of flaky tests.
| -rw-r--r-- | src/testdir/runtest.vim | 22 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 17 insertions, 7 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 245b51c64f..ae45a3eb4e 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -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()', \ ] diff --git a/src/version.c b/src/version.c index 1c48ef4c75..7f72146ea7 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1219, +/**/ 1218, /**/ 1217, |