From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 3 Sep 2016 16:47:24 +0000 (+0200)
Subject: patch 7.4.2316
X-Git-Tag: v7.4.2316
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7f3e32fcc4984d87f26337316379c2e2d90f7f1;p=vim

patch 7.4.2316
Problem:    Channel sort test is flaky.
Solution:   Add a check the output has been read.
---

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 251de600c..4b511118a 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -831,6 +831,7 @@ func Run_pipe_through_sort(all, use_buffer)
   call assert_equal("dead", job_status(g:job))
 
   sp sortout
+  call WaitFor('line("$") > 3')
   call assert_equal('Reading from channel output...', getline(1))
   if a:all
     call assert_equal(['aaa', 'bbb', 'ccc', 'ddd', 'eee'], getline(2, 6))
diff --git a/src/version.c b/src/version.c
index 297830f05..04cf59ea8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2316,
 /**/
     2315,
 /**/