summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_channel.vim14
-rw-r--r--src/version.c2
2 files changed, 14 insertions, 2 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 5a315679c..3f6511ad0 100644
--- 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 417a0e374..e2615be18 100644
--- 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,