patch 8.2.1484: flaky failure in assert_fails()

Problem:    Flaky failure in assert_fails().
Solution:   Only used fourth argument if there is a third argument.

diff --git a/src/testing.c b/src/testing.c
index 09718760a8e4b9b12d7a3fd9bba28d06be46794f..ed2d511f2ccef8a431dbb96a561ee36a26a67ad0 100644 (file)
--- 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 028b910a18490dd8f834d7dc2f60371c34071c22..80f464a36d9248543adc435e65088ea5ef040bd9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1484,
 /**/
     1483,
 /**/