patch 8.2.0470: Test_confirm_cmd_cancel() can fail on a slow system

Problem:    Test_confirm_cmd_cancel() can fail on a slow system.
Solution:   Use WaitForAssert(). (Ozaki Kiichi, closes #5861)

diff --git a/src/testdir/test_excmd.vim b/src/testdir/test_excmd.vim
index d5588d670a178d982cb4ef5efdf44f4df4d378c1..2d4d520532d28501a465d8b36609d24e6970951f 100644 (file)
--- a/src/testdir/test_excmd.vim
+++ b/src/testdir/test_excmd.vim
@@ -259,7 +259,7 @@ func Test_confirm_cmd_cancel()
   call WaitForAssert({-> assert_match('^\[Y\]es, (N)o, (C)ancel: *$',
         \ term_getline(buf, 20))}, 1000)
   call term_sendkeys(buf, "C")
-  call term_wait(buf, 50)
+  call WaitForAssert({-> assert_equal('', term_getline(buf, 20))}, 1000)
   call term_sendkeys(buf, ":confirm close\n")
   call WaitForAssert({-> assert_match('^\[Y\]es, (N)o, (C)ancel: *$',
         \ term_getline(buf, 20))}, 1000)

diff --git a/src/version.c b/src/version.c
index 8bf06a13c711aec062e98c2dbfc6420343fc0593..954a751d58dfb59100e87ee0f54c06ea50763dbd 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    470,
 /**/
     469,
 /**/