changeset 7925:b724dbb299d5 v7.4.1258

commit https://github.com/vim/vim/commit/a02b321686d9827ac806353ea8af780676da340d Author: Bram Moolenaar <Bram@vim.org> Date: Thu Feb 4 21:03:33 2016 +0100 patch 7.4.1258 Problem: The channel test can fail if messages arrive later. Solution: Add a short sleep. (Jun T.)
author Christian Brabandt <cb@256bit.org>
date Thu, 04 Feb 2016 21:15:05 +0100
parents 00d64eb49ce1
children 7fa5a5ae755e
files src/testdir/test_channel.vim src/version.c
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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,