diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-26 19:20:26 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-26 19:20:26 +0200 |
| commit | dd74ab9b464f3d1a5f6f6395469b76f8e0e6dccd (patch) | |
| tree | 2bb3dc692ebe8edf6d8b71d57179fed32dbdd726 | |
| parent | 4d6f32cbfbaf324ac4a25c0206a5db0e9f7a48f7 (diff) | |
| download | vim-git-dd74ab9b464f3d1a5f6f6395469b76f8e0e6dccd.tar.gz | |
patch 7.4.2260v7.4.2260
Problem: Channel test is flaky.
Solution: Add a newline to separate JSON messages.
| -rw-r--r-- | src/testdir/test_channel.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 964024474..ee52eef89 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -368,11 +368,11 @@ func Ch_raw_one_time_callback(port) call ch_setoptions(handle, {'mode': 'raw'}) " The message are sent raw, we do our own JSON strings here. - call ch_sendraw(handle, "[1, \"hello!\"]", {'callback': 'Ch_handleRaw1'}) + call ch_sendraw(handle, "[1, \"hello!\"]\n", {'callback': 'Ch_handleRaw1'}) call WaitFor('g:Ch_reply1 != ""') call assert_equal("[1, \"got it\"]", g:Ch_reply1) - call ch_sendraw(handle, "[2, \"echo something\"]", {'callback': 'Ch_handleRaw2'}) - call ch_sendraw(handle, "[3, \"wait a bit\"]", {'callback': 'Ch_handleRaw3'}) + call ch_sendraw(handle, "[2, \"echo something\"]\n", {'callback': 'Ch_handleRaw2'}) + call ch_sendraw(handle, "[3, \"wait a bit\"]\n", {'callback': 'Ch_handleRaw3'}) call WaitFor('g:Ch_reply2 != ""') call assert_equal("[2, \"something\"]", g:Ch_reply2) " wait for the 200 msec delayed reply diff --git a/src/version.c b/src/version.c index c2b66980c..f29263b47 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2260, +/**/ 2259, /**/ 2258, |