diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-05-12 21:12:12 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-05-12 21:12:12 +0200 |
| commit | 54c6bafa1609f2d870874d0047b394670602350e (patch) | |
| tree | 9e632505afb4b818496e4af6b72ab63665e9b0ae | |
| parent | ee62f9fa748ea528eb2a06b3e22ef9a5aecb7cca (diff) | |
| download | vim-git-54c6bafa1609f2d870874d0047b394670602350e.tar.gz | |
patch 8.0.1823: test for terminal stdout redirection is flakyv8.0.1823
Problem: Test for terminal stdout redirection is flaky.
Solution: Wait for the job to finish.
| -rw-r--r-- | src/testdir/test_terminal.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim index 14466900a..e9b69533d 100644 --- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1502,6 +1502,7 @@ func Test_terminal_out_err() call assert_equal("this is standard out", readfile(outfile)[0]) call assert_equal('this is standard error', term_getline(buf, 1)) + call WaitForAssert({-> assert_equal('dead', job_status(term_getjob(buf)))}) exe buf . 'bwipe' call delete('Xechoerrout.sh') call delete(outfile) diff --git a/src/version.c b/src/version.c index 981d65033..8af1a9590 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 */ /**/ + 1823, +/**/ 1822, /**/ 1821, |