From 56c9fd01076bc62b55c8cb89d8a66f6136e52f3a Mon Sep 17 00:00:00 2001 From: Dominique Pelle Date: Wed, 19 May 2021 00:16:14 +0200 Subject: [PATCH] patch 8.2.2872: Python tests fail without the channel feature MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Problem: Python tests fail without the channel feature. Solution: Add a feature check. (Dominique Pellé, closes #8226) --- src/testdir/test_python2.vim | 8 ++++++-- src/testdir/test_python3.vim | 8 ++++++-- src/version.c | 2 ++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/testdir/test_python2.vim b/src/testdir/test_python2.vim index cf35a50b3..84c917316 100644 --- a/src/testdir/test_python2.vim +++ b/src/testdir/test_python2.vim @@ -814,8 +814,12 @@ func Test_python_vim_bindeval() call assert_equal(v:none, pyeval("vim.bindeval('v:none')")) " channel/job - call assert_equal(v:none, pyeval("vim.bindeval('test_null_channel()')")) - call assert_equal(v:none, pyeval("vim.bindeval('test_null_job()')")) + if has('channel') + call assert_equal(v:none, pyeval("vim.bindeval('test_null_channel()')")) + endif + if has('job') + call assert_equal(v:none, pyeval("vim.bindeval('test_null_job()')")) + endif endfunc " threading diff --git a/src/testdir/test_python3.vim b/src/testdir/test_python3.vim index 58b6427f3..1e9ef82b0 100644 --- a/src/testdir/test_python3.vim +++ b/src/testdir/test_python3.vim @@ -1007,8 +1007,12 @@ func Test_python3_vim_bindeval() call assert_equal(v:none, py3eval("vim.bindeval('v:none')")) " channel/job - call assert_equal(v:none, py3eval("vim.bindeval('test_null_channel()')")) - call assert_equal(v:none, py3eval("vim.bindeval('test_null_job()')")) + if has('channel') + call assert_equal(v:none, py3eval("vim.bindeval('test_null_channel()')")) + endif + if has('job') + call assert_equal(v:none, py3eval("vim.bindeval('test_null_job()')")) + endif endfunc " threading diff --git a/src/version.c b/src/version.c index 8d73f68c0..af4046250 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2872, /**/ 2871, /**/ -- 2.40.0