diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-06-19 20:08:14 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-06-19 20:08:14 +0200 |
| commit | 5319191a2a726c18a153ee53e9fac506340d16c7 (patch) | |
| tree | 79db0d1956e3d1a4025f1ef2a70fcfb903630237 | |
| parent | f9c3883b11b33f0c548df5e949ba59fde74d3e7b (diff) | |
| download | vim-5319191a2a726c18a153ee53e9fac506340d16c7.zip | |
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)
| -rw-r--r-- | src/testdir/test_terminal.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index bce7e10de..52c35aaaa 100644 --- 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)))}) diff --git a/src/version.c b/src/version.c index 72a823858..9a1fbc654 100644 --- 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, |