From e38a2f7ebda791bcecccd657919ae9f7e2f6438c Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 2 Jun 2016 20:07:09 +0200
Subject: patch 7.4.1879 Problem:    Channel test is flaky. Solution:   Wait
 for close_cb to be invoked.

---
 src/testdir/test_channel.vim | 2 +-
 src/version.c                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index b4e9d7f9b..a60147bd4 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -708,7 +708,7 @@ func Run_test_pipe_to_buffer(use_name, nomod)
     call ch_sendraw(handle, "double this\n")
     call ch_sendraw(handle, "quit\n")
     sp pipe-output
-    call s:waitFor('line("$") >= 6')
+    call s:waitFor('line("$") >= 6 && s:bufClosed == "yes"')
     call assert_equal([firstline, 'line one', 'line two', 'this', 'AND this', 'Goodbye!'], getline(1, '$'))
     if a:nomod
       call assert_equal(0, &modifiable)
diff --git a/src/version.c b/src/version.c
index f450ba8bb..7373e70dd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1879,
 /**/
     1878,
 /**/
-- 
cgit v1.2.1