To: vim_dev@googlegroups.com Subject: Patch 7.4.2316 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2316 Problem: Channel sort test is flaky. Solution: Add a check the output has been read. Files: src/testdir/test_channel.vim *** ../vim-7.4.2315/src/testdir/test_channel.vim 2016-09-01 18:32:05.298122950 +0200 --- src/testdir/test_channel.vim 2016-09-03 18:43:31.875536424 +0200 *************** *** 831,836 **** --- 831,837 ---- 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)) *** ../vim-7.4.2315/src/version.c 2016-09-03 17:33:39.752215409 +0200 --- src/version.c 2016-09-03 18:44:49.146873802 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2316, /**/ -- hundred-and-one symptoms of being an internet addict: 153. You find yourself staring at your "inbox" waiting for new e-mail to arrive. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///