summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-03-19 16:22:44 +0100
committerBram Moolenaar <Bram@vim.org>2020-03-19 16:22:44 +0100
commit3696839ef1165804159e28f50cb6113acc3d519d (patch)
treea921ae3b993440d7e4558769d15bfbf8cdc2a89a /src
parentb68df220c5278365792b8f94d8d6f34d329b7746 (diff)
downloadvim-git-3696839ef1165804159e28f50cb6113acc3d519d.tar.gz
patch 8.2.0410: channel test fails too often on slow Macv8.2.0410
Problem: Channel test fails too often on slow Mac. Solution: Increase waiting time to 10 seconds.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_channel.vim3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 2034aecfb..a820be548 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1160,7 +1160,8 @@ func Test_out_cb()
" Receive a json object split in pieces
let g:Ch_outobj = ''
call ch_sendraw(job, "echosplit [0, {\"one\": 1,| \"tw|o\": 2, \"three\": 3|}]\n")
- call WaitForAssert({-> assert_equal({'one': 1, 'two': 2, 'three': 3}, g:Ch_outobj)})
+ " For unknown reason this can be very slow on Mac.
+ call WaitForAssert({-> assert_equal({'one': 1, 'two': 2, 'three': 3}, g:Ch_outobj)}, 10000)
finally
call job_stop(job)
endtry
diff --git a/src/version.c b/src/version.c
index 8c7e5d63c..367686c72 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 410,
+/**/
409,
/**/
408,