diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-07 22:26:28 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-07 22:26:28 +0100 |
| commit | 304563c0b3e24895322ce3a29378388665b4769b (patch) | |
| tree | 6ba2636de9bc5bfda57b9ef45b6c7cbd0afcfc5e | |
| parent | 151f656e171f6ffbb0cbeb343cbcf2ffac0c36b0 (diff) | |
patch 7.4.1510v7.4.1510
Problem: Channel test fails on AppVeyor.
Solution: Wait longer than 10 msec if needed.
| -rw-r--r-- | src/testdir/test_channel.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 5a315679cb..3f6511ad07 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 417a0e374e..e2615be189 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, |