# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1464891306 -7200
# Node ID ce045e4d3244f52cd323c71192a06b56959a0166
# Parent  468d1d8dc054848439b0b991a802fd7eddd196dc
commit https://github.com/vim/vim/commit/e38a2f7ebda791bcecccd657919ae9f7e2f6438c
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Jun 2 20:07:09 2016 +0200

    patch 7.4.1879
    Problem:    Channel test is flaky.
    Solution:   Wait for close_cb to be invoked.

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -708,7 +708,7 @@ func Run_test_pipe_to_buffer(use_name, n
     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
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1879,
+/**/
     1878,
 /**/
     1877,