From 9ae3bbdb960c3bed20a6db75a75a0a567d570bea Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 19 Feb 2020 14:31:33 +0100 Subject: [PATCH] patch 8.2.0278: channel test is flaky on Mac Problem: Channel test is flaky on Mac. Solution: Reset variable before sending message. --- src/testdir/test_channel.vim | 3 +-- 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 16fe5c782..c98f5bd68 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 b76a35414..d74b0fa78 100644 --- a/src/version.c +++ b/src/version.c @@ -738,6 +738,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 278, /**/ 277, /**/ -- 2.50.1