diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-02-19 14:31:33 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-02-19 14:31:33 +0100 |
| commit | 9ae3bbdb960c3bed20a6db75a75a0a567d570bea (patch) | |
| tree | 05515faace163cda3f88148193af70b455bcd800 | |
| parent | ee2e52aa0655e02f900c74fb3a770bc55956d63d (diff) | |
patch 8.2.0278: channel test is flaky on Macv8.2.0278
Problem: Channel test is flaky on Mac.
Solution: Reset variable before sending message.
| -rw-r--r-- | src/testdir/test_channel.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 16fe5c7829..c98f5bd683 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -1158,9 +1158,8 @@ func Test_out_cb() call WaitForAssert({-> assert_equal("dict: there", g:Ch_errmsg)}) " Receive a json object split in pieces - unlet! g:Ch_outobj - call ch_sendraw(job, "echosplit [0, {\"one\": 1,| \"tw|o\": 2, \"three\": 3|}]\n") let g:Ch_outobj = '' + call ch_sendraw(job, "echosplit [0, {\"one\": 1,| \"tw|o\": 2, \"three\": 3|}]\n") call WaitForAssert({-> assert_equal({'one': 1, 'two': 2, 'three': 3}, g:Ch_outobj)}) finally call job_stop(job) diff --git a/src/version.c b/src/version.c index b76a35414d..d74b0fa784 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 278, +/**/ 277, /**/ 276, |