# HG changeset patch # User Christian Brabandt # Date 1455919206 -3600 # Node ID 3462f9cfedf8388d0be5d443c81024293029e271 # Parent 6b08fa169bd6a07ff12975dc33c59fd7e9116ef0 commit https://github.com/vim/vim/commit/1f6ef66254c1e25ef1c7972aa9a0ba119ebc17e4 Author: Bram Moolenaar Date: Fri Feb 19 22:59:44 2016 +0100 patch 7.4.1359 Problem: Channel test ch_sendexpr() times out. Solution: Increase the timeout diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -146,7 +146,7 @@ func s:communicate(port) " check setting options (without testing the effect) call ch_setoptions(handle, {'callback': 's:NotUsed'}) - call ch_setoptions(handle, {'timeout': 111}) + call ch_setoptions(handle, {'timeout': 1111}) call assert_fails("call ch_setoptions(handle, {'waittime': 111})", "E475") call assert_fails("call ch_setoptions(handle, {'mode': 'json'})", "E475") diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1359, +/**/ 1358, /**/ 1357,