diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-02-11 16:51:52 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-02-11 19:03:28 +0100 |
| commit | e4952ee006e406e0da4ffe157e4b356a0d6c8219 (patch) | |
| tree | 64ba5a65b8683871f6fe4bebc90bdbc8d4c73e72 | |
| parent | f69e0d314fe2ab3e2456441b593f4f154dba1026 (diff) | |
| download | rneovim-e4952ee006e406e0da4ffe157e4b356a0d6c8219.tar.gz rneovim-e4952ee006e406e0da4ffe157e4b356a0d6c8219.tar.bz2 rneovim-e4952ee006e406e0da4ffe157e4b356a0d6c8219.zip | |
vim-patch:8.0.1219: terminal test is flaky
Problem: Terminal test is flaky.
Solution: Add test function to list of flaky tests.
https://github.com/vim/vim/commit/f204e05ae9f6bc5d922d14d457e16b590efbf3e5
| -rw-r--r-- | src/nvim/testdir/runtest.vim | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim index 890dc34030..c8a6065311 100644 --- a/src/nvim/testdir/runtest.vim +++ b/src/nvim/testdir/runtest.vim @@ -98,14 +98,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 @@ -214,6 +221,7 @@ endif " Names of flaky tests. let s:flaky = [ \ 'Test_oneshot()', + \ 'Test_terminal_composing_unicode()', \ 'Test_with_partial_callback()', \ 'Test_lambda_with_timer()', \ ] |