summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDominique Pelle <dominique.pelle@gmail.com>2021-05-19 00:16:14 +0200
committerBram Moolenaar <Bram@vim.org>2021-05-19 00:16:14 +0200
commit56c9fd01076bc62b55c8cb89d8a66f6136e52f3a (patch)
treece37ec81410eab0700a95a43810fd5c270cf4ad4 /src
parent4781d6fd8670af415c3b78f00d70036af85bd286 (diff)
downloadvim-git-56c9fd01076bc62b55c8cb89d8a66f6136e52f3a.tar.gz
patch 8.2.2872: Python tests fail without the channel featurev8.2.2872
Problem: Python tests fail without the channel feature. Solution: Add a feature check. (Dominique Pellé, closes #8226)
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_python2.vim8
-rw-r--r--src/testdir/test_python3.vim8
-rw-r--r--src/version.c2
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
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2872,
+/**/
2871,
/**/
2870,