# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1454616905 -3600
# Node ID b724dbb299d5ba8c7b4a7bb80955257486a10986
# Parent  00d64eb49ce1005928c5769665e60822c2f4f1ed
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.)

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
@@ -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
--- 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,