summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-09-05 20:29:25 +0200
committerBram Moolenaar <Bram@vim.org>2017-09-05 20:29:25 +0200
commit8b53b79ea5304c7714cbb873210c82aa3fc8772f (patch)
tree9338f9551bd3c5a5900ee8438542d26788668503
parent1bfdc07a4996b5905b4971e18a6487a18e6461a4 (diff)
downloadvim-git-8b53b79ea5304c7714cbb873210c82aa3fc8772f.tar.gz
patch 8.0.1058: terminal redirection test is flakyv8.0.1058
Problem: Terminal redirection test is flaky. Solution: Wait for job to finish.
-rw-r--r--src/testdir/test_terminal.vim2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 2ee25bf7c..800567920 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -614,6 +614,8 @@ func Test_terminal_redir_file()
call term_wait(buf)
call WaitFor('term_getline(' . buf . ', 1) == "one line"')
call assert_equal('one line', term_getline(buf, 1))
+ let g:job = term_getjob(buf)
+ call WaitFor('job_status(g:job) == "dead"')
bwipe
call delete('Xfile')
endif
diff --git a/src/version.c b/src/version.c
index 8fa740d78..79ce0e042 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1058,
+/**/
1057,
/**/
1056,