changeset 14141:43efca4c482f v8.1.0088

patch 8.1.0088: terminal test for stdout and stderr is a bit flaky commit https://github.com/vim/vim/commit/5319191a2a726c18a153ee53e9fac506340d16c7 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jun 19 20:08:14 2018 +0200 patch 8.1.0088: terminal test for stdout and stderr is a bit flaky Problem: Terminal test for stdout and stderr is a bit flaky. Solution: Wait for both stdout and stderr to have been processed. (Ozaki Kiichi, closes #2991)
author Christian Brabandt <cb@256bit.org>
date Tue, 19 Jun 2018 20:15:05 +0200
parents 752fc522d342
children fa3b1a61186f
files src/testdir/test_terminal.vim src/version.c
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1487,8 +1487,9 @@ func Test_terminal_out_err()
 
   let outfile = 'Xtermstdout'
   let buf = term_start(['./Xechoerrout.sh'], {'out_io': 'file', 'out_name': outfile})
-  call WaitForAssert({-> assert_inrange(1, 2, len(readfile(outfile)))})
-  call assert_equal("this is standard out", readfile(outfile)[0])
+
+  call WaitFor({-> !empty(readfile(outfile)) && !empty(term_getline(buf, 1))})
+  call assert_equal(['this is standard out'], readfile(outfile))
   call assert_equal('this is standard error', term_getline(buf, 1))
 
   call WaitForAssert({-> assert_equal('dead', job_status(term_getjob(buf)))})
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    88,
+/**/
     87,
 /**/
     86,