summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-02-23 13:29:31 +0100
committerBram Moolenaar <Bram@vim.org>2020-02-23 13:29:31 +0100
commit95ffd43f88226599728d15cb1b7b272111ea1266 (patch)
treefdc4fbf5a34c07e47b3e5db80bd005b6594375b4
parentd28e0b3652067788fcc9c99058b0b6eee7beebee (diff)
patch 8.2.0304: terminal test if failing on some systemsv8.2.0304
Problem: Terminal test if failing on some systems. Solution: Wait for the job to finish. (James McCoy)
-rw-r--r--src/testdir/test_terminal.vim3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 64bc7db1ed..b86614de5c 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -781,7 +781,8 @@ func Test_terminal_special_chars()
call writefile(['x'], 'Xdir with spaces/quoted"file')
term ls Xdir\ with\ spaces/quoted\"file
call WaitForAssert({-> assert_match('quoted"file', term_getline('', 1))})
- call term_wait('')
+ " make sure the job has finished
+ call WaitForAssert({-> assert_match('finish', term_getstatus(bufnr()))})
call delete('Xdir with spaces', 'rf')
bwipe
diff --git a/src/version.c b/src/version.c
index 97669c0955..ce3702d838 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 304,
+/**/
303,
/**/
302,