diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-04 21:03:33 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-04 21:03:33 +0100 |
| commit | a02b321686d9827ac806353ea8af780676da340d (patch) | |
| tree | d1ad70e6275694aa3a1313a50f47e8bc69f6bc2d /src | |
| parent | 681baaf4a4c81418693dcafb81421a8614832e91 (diff) | |
| download | vim-a02b321686d9827ac806353ea8af780676da340d.zip | |
patch 7.4.1258
Problem: The channel test can fail if messages arrive later.
Solution: Add a short sleep. (Jun T.)
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_channel.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 80ccb0823..f4c8e575b 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -88,14 +88,17 @@ func Test_communicate() " Send an eval request that works. call assert_equal('ok', ch_sendexpr(handle, 'eval-works')) + sleep 10m call assert_equal([-1, 'foo123'], ch_sendexpr(handle, 'eval-result')) " Send an eval request that fails. call assert_equal('ok', ch_sendexpr(handle, 'eval-fails')) + sleep 10m call assert_equal([-2, 'ERROR'], ch_sendexpr(handle, 'eval-result')) " Send a bad eval request. There will be no response. call assert_equal('ok', ch_sendexpr(handle, 'eval-bad')) + sleep 10m call assert_equal([-2, 'ERROR'], ch_sendexpr(handle, 'eval-result')) " make the server quit, can't check if this works, should not hang. diff --git a/src/version.c b/src/version.c index 7192bae1d..dfed7c2b5 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1258, +/**/ 1257, /**/ 1256, |