# HG changeset patch # User Bram Moolenaar # Date 1651841103 -7200 # Node ID ec4086492eda74e1f90358f0806941d23095c237 # Parent e15ad62b584a6de2c3466363b71738660ef2958c patch 8.2.4885: test fails with the job/channel feature Commit: https://github.com/vim/vim/commit/f1d63b9cba9ca91d6367615c6098761c30c6cb5b Author: Bram Moolenaar Date: Fri May 6 13:37:42 2022 +0100 patch 8.2.4885: test fails with the job/channel feature Problem: Test fails with the job/channel feature. Solution: Move check for job/channel separately. diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -4199,10 +4199,6 @@ def Test_echo_uninit_variables() var Var_func: func var var_string: string var var_blob: blob - if has('job') - var var_job: job - var var_channel: channel - endif var var_list: list var var_dict: dict @@ -4213,19 +4209,23 @@ def Test_echo_uninit_variables() echo Var_func echo var_string echo var_blob - if has('job') - echo var_job - echo var_channel - else - echo 'no process' - echo 'channel fail' - endif echo var_list echo var_dict redir END - assert_equal(['false', '0', '0.0', 'function()', '', '0z', 'no process', - 'channel fail', '[]', '{}'], res->split('\n')) + assert_equal(['false', '0', '0.0', 'function()', '', '0z', '[]', '{}'], res->split('\n')) + + if has('job') + var var_job: job + var var_channel: channel + + redir => res + echo var_job + echo var_channel + redir END + + assert_equal(['no process', 'channel fail'], res->split('\n')) + endif enddef " Keep this last, it messes up highlighting. diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4885, +/**/ 4884, /**/ 4883,