From 5643db84c6a9f15d14492cefd52647623aa2ac7c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 3 Dec 2016 14:29:10 +0100 Subject: [PATCH] patch 8.0.0120 Problem: Channel test is still flaky on OS X. Solution: Set the drop argument to "never". --- src/testdir/test_channel.vim | 3 +++ src/version.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 31c2e5017..7baac1d67 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -26,7 +26,10 @@ func Ch_requestHandler(handle, msg) endfunc func Ch_communicate(port) + " Avoid dropping messages, since we don't use a callback here. + let s:chopt.drop = 'never' let handle = ch_open('localhost:' . a:port, s:chopt) + unlet s:chopt.drop if ch_status(handle) == "fail" call assert_false(1, "Can't open channel") return diff --git a/src/version.c b/src/version.c index eaf4a38b2..a20159cdf 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 */ +/**/ + 120, /**/ 119, /**/ -- 2.50.1