patch 7.4.1510

Problem:    Channel test fails on AppVeyor.
Solution:   Wait longer than 10 msec if needed.

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 5a315679cb29d4b44436800183be3ef765f32f4b..3f6511ad07f112041bfd5c4fbfedfeae6a1957bc 100644 (file)
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -395,11 +395,21 @@ func s:raw_one_time_callback(port)
 
   " The message are sent raw, we do our own JSON strings here.
   call ch_sendraw(handle, "[1, \"hello!\"]", {'callback': 's:HandleRaw1'})
-  sleep 10m
+  for i in range(50)
+    sleep 10m
+    if s:reply1 != ''
+      break
+    endif
+  endfor
   call assert_equal("[1, \"got it\"]", s:reply1)
   call ch_sendraw(handle, "[2, \"echo something\"]", {'callback': 's:HandleRaw2'})
   call ch_sendraw(handle, "[3, \"wait a bit\"]", {'callback': 's:HandleRaw3'})
-  sleep 10m
+  for i in range(50)
+    sleep 10m
+    if s:reply2 != ''
+      break
+    endif
+  endfor
   call assert_equal("[2, \"something\"]", s:reply2)
   " wait for up to 500 msec for the 200 msec delayed reply
   for i in range(50)

diff --git a/src/version.c b/src/version.c
index 417a0e374e42c5eee275646ae5978ec1e33730b9..e2615be189c2d1dc23f43677dfb9f58b54482e61 100644 (file)
--- 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 */
+/**/
+    1510,
 /**/
     1509,
 /**/