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
index 8ad3b303eca04379bd63dc2294f036624e87f0c4..c5c3eb989d76b199121f8f947973eab3bacc554d 100644 (file)
--- 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<any>
   var var_dict: dict<any>
 
@@ -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
index 77aab2fcb89f1eed76d6d6dcdebaeaf86a432a3e..24219311fba21fa21716a1b77f7d299123389a65 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4885,
 /**/
     4884,
 /**/