diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-09-23 21:01:54 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-09-23 21:01:54 +0100 |
| commit | a9b0f8f7f35ddd281f4fa464d163dc4fb05e1d7b (patch) | |
| tree | c3f9c1c9c883219c711aae8fe7a6f68f5d0f16f4 | |
| parent | 35fdd9a67d73d4750152c419d4193ebb6b6d6eee (diff) | |
patch 9.0.0563: timer_info() test failsv9.0.0563
Problem: Timer_info() test fails.
Solution: Ignore test timeout timer. Don't use test_null_job() when not
available.
| -rw-r--r-- | src/testdir/test_vim9_builtin.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_vimscript.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim index fb21683c09..e09f913709 100644 --- 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 affb958f1d..7698ce836d 100644 --- 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 665adc1ac2..fc3b3567cd 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 563, +/**/ 562, /**/ 561, |