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
index b4e9d7f9b09562e4f124e417fd7f259db5ad9c55..a60147bd444de0940aa02668ed0bc49a0a17326a 100644 (file)
--- 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 f450ba8bbb0fdf6aab6cab56125450cf668e344c..7373e70ddc67275f8a51dd606e64b13c71ed682e 100644 (file)
--- 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,
 /**/