patch 9.0.0563: timer_info() test fails

Problem:    Timer_info() test fails.
Solution:   Ignore test timeout timer.  Don't use test_null_job() when not
            available.

diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index fb21683c09c248beaa577bfbbf5783423a671d91..e09f913709e02c8323885304bcecc4172ecfc591 100644 (file)
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -4520,7 +4520,7 @@ enddef
 def Test_timer_info()
   v9.CheckDefAndScriptFailure(['timer_info("id")'], ['E1013: Argument 1: type mismatch, expected number but got string', 'E1210: Number required for argument 1'])
   assert_equal([], timer_info(100))
-  assert_equal([], timer_info())
+  assert_equal([], timer_info()->filter((_, t) => t.callback->string() !~ 'TestTimeout'))
 enddef
 
 def Test_timer_pause()

diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim
index affb958f1dcbe7f3b7dc160c275d7046c4ed8e32..7698ce836d0083730bfa3bfe1138d657b54f3052 100644 (file)
--- a/src/testdir/test_vimscript.vim
+++ b/src/testdir/test_vimscript.vim
@@ -7217,8 +7217,10 @@ func Test_refcount()
     unlet d
     delfunc DictFunc
 
-    call assert_equal(-1, test_refcount(test_null_job()))
-    call assert_equal(-1, test_refcount(test_null_channel()))
+    if has('channel')
+      call assert_equal(-1, test_refcount(test_null_job()))
+      call assert_equal(-1, test_refcount(test_null_channel()))
+    endif
     call assert_equal(-1, test_refcount(test_null_function()))
     call assert_equal(-1, test_refcount(test_null_partial()))
     call assert_equal(-1, test_refcount(test_null_blob()))

diff --git a/src/version.c b/src/version.c
index 665adc1ac21d66230e689e3fa2982a4531d86f2b..fc3b3567cd64db40816354d58eef6b1110e60320 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    563,
 /**/
     562,
 /**/