diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-12-03 14:29:10 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-12-03 14:29:10 +0100 |
| commit | 5643db84c6a9f15d14492cefd52647623aa2ac7c (patch) | |
| tree | 82ba7462926b0e1bd73235a6c83444a624fb4579 | |
| parent | 21efc3633edb58809c5dd89b025d34d7002e731c (diff) | |
patch 8.0.0120v8.0.0120
Problem: Channel test is still flaky on OS X.
Solution: Set the drop argument to "never".
| -rw-r--r-- | src/testdir/test_channel.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 31c2e50175..7baac1d677 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 eaf4a38b2a..a20159cdfc 100644 --- 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, |