summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-03-28 21:48:55 +0100
committerBram Moolenaar <Bram@vim.org>2020-03-28 21:48:55 +0100
commit7b1b36b1cb744e87adfbef88b7ce26c863b0594a (patch)
tree8636ba828299357b26c7a7bbe7832c640226c1db
parentee619e5bc0992e818f2d9540b093b769b9c27651 (diff)
downloadvim-git-7b1b36b1cb744e87adfbef88b7ce26c863b0594a.tar.gz
patch 8.2.0470: Test_confirm_cmd_cancel() can fail on a slow systemv8.2.0470
Problem: Test_confirm_cmd_cancel() can fail on a slow system. Solution: Use WaitForAssert(). (Ozaki Kiichi, closes #5861)
-rw-r--r--src/testdir/test_excmd.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_excmd.vim b/src/testdir/test_excmd.vim
index d5588d670..2d4d52053 100644
--- 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 8bf06a13c..954a751d5 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 */
/**/
+ 470,
+/**/
469,
/**/
468,