From a02b321686d9827ac806353ea8af780676da340d Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 4 Feb 2016 21:03:33 +0100 Subject: patch 7.4.1258 Problem: The channel test can fail if messages arrive later. Solution: Add a short sleep. (Jun T.) --- src/testdir/test_channel.vim | 3 +++ src/version.c | 2 ++ 2 files changed, 5 insertions(+) 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 @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1258, /**/ 1257, /**/ -- cgit v1.2.1