Skip to content

Commit 5643db8

Browse files
committed
patch 8.0.0120
Problem: Channel test is still flaky on OS X. Solution: Set the drop argument to "never".
1 parent 21efc36 commit 5643db8

2 files changed

Lines changed: 5 additions & 0 deletions

File tree

src/testdir/test_channel.vim

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ func Ch_requestHandler(handle, msg)
2626
endfunc
2727

2828
func Ch_communicate(port)
29+
" Avoid dropping messages, since we don't use a callback here.
30+
let s:chopt.drop = 'never'
2931
let handle = ch_open('localhost:' . a:port, s:chopt)
32+
unlet s:chopt.drop
3033
if ch_status(handle) == "fail"
3134
call assert_false(1, "Can't open channel")
3235
return

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
120,
767769
/**/
768770
119,
769771
/**/

0 commit comments

Comments
 (0)