changeset 8438:541ca10b3bc7 v7.4.1510

commit https://github.com/vim/vim/commit/304563c0b3e24895322ce3a29378388665b4769b Author: Bram Moolenaar <Bram@vim.org> Date: Mon Mar 7 22:26:28 2016 +0100 patch 7.4.1510 Problem: Channel test fails on AppVeyor. Solution: Wait longer than 10 msec if needed.
author Christian Brabandt <cb@256bit.org>
date Mon, 07 Mar 2016 22:30:04 +0100
parents cba3eee020fa
children e2c8b6671ec0
files src/testdir/test_channel.vim src/version.c
diffstat 2 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1510,
+/**/
     1509,
 /**/
     1508,