# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1472922006 -7200
# Node ID 68303019acc994c41e623b6be3235f7342f2be67
# Parent  bf95df5089da2dc058452c2d9424f832a3e783b6
commit https://github.com/vim/vim/commit/f7f3e32fcc4984d87f26337316379c2e2d90f7f1
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Sep 3 18:47:24 2016 +0200

    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
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -831,6 +831,7 @@ func Run_pipe_through_sort(all, use_buff
   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
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2316,
+/**/
     2315,
 /**/
     2314,