diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-19 22:59:44 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-19 22:59:44 +0100 |
| commit | 1f6ef66254c1e25ef1c7972aa9a0ba119ebc17e4 (patch) | |
| tree | 8aee15ac9e5d2f6b6e7f2aa59adc0b7fcc48f123 | |
| parent | 1d6fbe654066845ff2a182ed258e6e9d3408fa90 (diff) | |
| download | vim-git-1f6ef66254c1e25ef1c7972aa9a0ba119ebc17e4.tar.gz | |
patch 7.4.1359v7.4.1359
Problem: Channel test ch_sendexpr() times out.
Solution: Increase the timeout
| -rw-r--r-- | src/testdir/test_channel.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 47b8a04e1..431e40727 100644 --- 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 index 9c252746d..4af3f65a7 100644 --- 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, |