commit 513537bfff59b94a26c63ab2bd458f21d4be774e
author Bram Moolenaar <Bram@vim.org> Sun Sep 22 23:03:58 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Sun Sep 22 23:03:58 2019 +0200
tree 48c9007496015c6ac8ace11f20fc1f801c9bfabf
parent cadbe1b1fbdf7d7740ae617710e0f6862fdee598

patch 8.1.2068: test for SafeState and SafeStateAgain may fail

Problem:    Test for SafeState and SafeStateAgain may fail.
Solution:   Accept more possible responses

src/testdir/test_autocmd.vim

diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index c3d3bbb..1f901a9 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2242,14 +2242,15 @@
   call writefile(lines, 'XSafeState')
   let buf = RunVimInTerminal('-S XSafeState', #{rows: 6})
 
+  " Sometimes we loop to handle an K_IGNORE
   call term_sendkeys(buf, ":echo g:safe\<CR>")
-  call WaitForAssert({-> assert_match('^2 ', term_getline(buf, 6))}, 1000)
+  call WaitForAssert({-> assert_match('^[12] ', term_getline(buf, 6))}, 1000)
 
   call term_sendkeys(buf, ":echo g:again\<CR>")
   call WaitForAssert({-> assert_match('^xxxx', term_getline(buf, 6))}, 1000)
 
   call term_sendkeys(buf, ":let g:again = ''\<CR>:call CallTimer()\<CR>")
-  call term_wait(buf)
+  call term_wait(buf, 50)
   call term_sendkeys(buf, ":echo g:again\<CR>")
   call WaitForAssert({-> assert_match('xtx', term_getline(buf, 6))}, 1000)
 

src/version.c

diff --git a/src/version.c b/src/version.c
index d163fba..678bc13 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2068,
+/**/
     2067,
 /**/
     2066,