changeset 10454:f5c7c76897fa v8.0.0120

commit https://github.com/vim/vim/commit/5643db84c6a9f15d14492cefd52647623aa2ac7c Author: Bram Moolenaar <Bram@vim.org> Date: Sat Dec 3 14:29:10 2016 +0100 patch 8.0.0120 Problem: Channel test is still flaky on OS X. Solution: Set the drop argument to "never".
author Christian Brabandt <cb@256bit.org>
date Sat, 03 Dec 2016 14:30:04 +0100
parents 15b87f017d8c
children e7cbe2896bfe
files src/testdir/test_channel.vim src/version.c
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    120,
+/**/
     119,
 /**/
     118,