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
index 80ccb08237e67e441b5d4382c7d1c095d917d73d..f4c8e575b4099aaa23f281c23587f8a6a811522a 100644 (file)
--- 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 7192bae1ddbe9b82cdbf79e9e376c36916f55414..dfed7c2b5f881f31ee05f062f4a2ee8d99584eb6 100644 (file)
--- 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,
 /**/