diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-08-18 23:24:13 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-08-18 23:24:13 +0200 |
| commit | 9b02d64cff7664b9643205d6e23b08da688fe87a (patch) | |
| tree | 804dcf431045364147355ac16b2cde1be7e75773 | |
| parent | 165036ddba1318576a29f75d82fae8c326a48f18 (diff) | |
| download | vim-git-9b02d64cff7664b9643205d6e23b08da688fe87a.tar.gz | |
patch 8.2.1484: flaky failure in assert_fails()v8.2.1484
Problem: Flaky failure in assert_fails().
Solution: Only used fourth argument if there is a third argument.
| -rw-r--r-- | src/testing.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testing.c b/src/testing.c index 09718760a..ed2d511f2 100644 --- a/src/testing.c +++ b/src/testing.c @@ -615,7 +615,8 @@ f_assert_fails(typval_T *argvars, typval_T *rettv) goto theend; } - if (!error_found && argvars[3].v_type == VAR_NUMBER + if (!error_found && argvars[2].v_type != VAR_UNKNOWN + && argvars[3].v_type == VAR_NUMBER && argvars[3].vval.v_number >= 0 && argvars[3].vval.v_number != emsg_assert_fails_lnum) { diff --git a/src/version.c b/src/version.c index 028b910a1..80f464a36 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1484, +/**/ 1483, /**/ 1482, |