From 513537bfff59b94a26c63ab2bd458f21d4be774e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 22 Sep 2019 23:03:58 +0200 Subject: [PATCH] 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 | 5 +++-- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index c3d3bbbd1..1f901a9ff 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -2242,14 +2242,15 @@ func Test_autocmd_SafeState() 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\") - 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\") call WaitForAssert({-> assert_match('^xxxx', term_getline(buf, 6))}, 1000) call term_sendkeys(buf, ":let g:again = ''\:call CallTimer()\") - call term_wait(buf) + call term_wait(buf, 50) call term_sendkeys(buf, ":echo g:again\") call WaitForAssert({-> assert_match('xtx', term_getline(buf, 6))}, 1000) diff --git a/src/version.c b/src/version.c index d163fbaa4..678bc13d4 100644 --- a/src/version.c +++ b/src/version.c @@ -757,6 +757,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2068, /**/ 2067, /**/ -- 2.50.1