From: Dominique Pelle Date: Tue, 18 May 2021 22:16:14 +0000 (+0200) Subject: patch 8.2.2872: Python tests fail without the channel feature X-Git-Tag: v8.2.2872 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56c9fd01076bc62b55c8cb89d8a66f6136e52f3a;p=thirdparty%2Fvim.git patch 8.2.2872: Python tests fail without the channel feature Problem: Python tests fail without the channel feature. Solution: Add a feature check. (Dominique Pellé, closes #8226) --- diff --git a/src/testdir/test_python2.vim b/src/testdir/test_python2.vim index cf35a50b32..84c917316d 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 58b6427f3e..1e9ef82b07 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 8d73f68c09..af4046250c 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, /**/