Mercurial > vim

changeset 10090:68303019acc9 v7.4.2316

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Christian Brabandt <cb@256bit.org>
date Sat, 03 Sep 2016 19:00:06 +0200
parents bf95df5089da
children 9e5e3392f9b6
files src/testdir/test_channel.vim src/version.c
diffstat 2 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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))
--- 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,