changeset 19505:e7eec9cae0ea v8.2.0310

patch 8.2.0310: autocmd test fails on a slow system Commit: https://github.com/vim/vim/commit/8fb1b47a5e24892b23c3923a07d8a850d99b14b2 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Feb 23 16:16:26 2020 +0100 patch 8.2.0310: autocmd test fails on a slow system Problem: Autocmd test fails on a slow system. Solution: Adjust the expectations. (James McCoy, closes https://github.com/vim/vim/issues/5685)
author Bram Moolenaar <Bram@vim.org>
date Sun, 23 Feb 2020 16:30:04 +0100
parents 7bbd5078ab6d
children 8602a051c9bd
files src/testdir/test_autocmd.vim src/version.c
diffstat 2 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2245,17 +2245,19 @@ func Test_autocmd_SafeState()
   call writefile(lines, 'XSafeState')
   let buf = RunVimInTerminal('-S XSafeState', #{rows: 6})
 
-  " Sometimes we loop to handle an K_IGNORE
+  " Sometimes we loop to handle a K_IGNORE, SafeState may be trigered once or
+  " more often.
   call term_sendkeys(buf, ":echo g:safe\<CR>")
-  call WaitForAssert({-> assert_match('^[12] ', term_getline(buf, 6))}, 1000)
+  call WaitForAssert({-> assert_match('^\d ', term_getline(buf, 6))}, 1000)
 
+  " SafeStateAgain should be invoked at least three times
   call term_sendkeys(buf, ":echo g:again\<CR>")
-  call WaitForAssert({-> assert_match('^xxxx', term_getline(buf, 6))}, 1000)
+  call WaitForAssert({-> assert_match('^xxx', term_getline(buf, 6))}, 1000)
 
   call term_sendkeys(buf, ":let g:again = ''\<CR>:call CallTimer()\<CR>")
-  call term_wait(buf, 50)
+  call term_wait(buf, 100)
   call term_sendkeys(buf, ":\<CR>")
-  call term_wait(buf, 50)
+  call term_wait(buf, 100)
   call term_sendkeys(buf, ":echo g:again\<CR>")
   call WaitForAssert({-> assert_match('xtx', term_getline(buf, 6))}, 1000)
 
--- 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 */
 /**/
+    310,
+/**/
     309,
 /**/
     308,