summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-12-21 18:11:24 +0100
committerBram Moolenaar <Bram@vim.org>2020-12-21 18:11:24 +0100
commit6f17a3f0237302b82cc31fb889d9094b51856948 (patch)
tree22550810dd504c7657e1be57d6b2d05f14c4c1f4
parent4f5e39775616795ac7d1c01bf15a1bd316feb387 (diff)
downloadvim-git-6f17a3f0237302b82cc31fb889d9094b51856948.tar.gz
patch 8.2.2180: Vim9: test for error after error is flakyv8.2.2180
Problem: Vim9: test for error after error is flaky. Solution: Wait for job to finish instead of a fixed delay.
-rw-r--r--src/testdir/test_vim9_script.vim5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 5406391a7..2f6655287 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -3096,7 +3096,10 @@ def Test_no_unknown_error_after_error()
source += l
enddef
var myjob = job_start('echo burp', {out_cb: Out_cb, exit_cb: Exit_cb, mode: 'raw'})
- sleep 100m
+ while job_status(myjob) == 'run'
+ sleep 10m
+ endwhile
+ sleep 10m
END
writefile(lines, 'Xdef')
assert_fails('so Xdef', ['E684:', 'E1012:'])
diff --git a/src/version.c b/src/version.c
index 9e1327d0d..07edd0c9e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2180,
+/**/
2179,
/**/
2178,