diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-09-22 23:03:58 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-09-22 23:03:58 +0200 |
| commit | 513537bfff59b94a26c63ab2bd458f21d4be774e (patch) | |
| tree | 48c9007496015c6ac8ace11f20fc1f801c9bfabf /src | |
| parent | cadbe1b1fbdf7d7740ae617710e0f6862fdee598 (diff) | |
| download | vim-git-513537bfff59b94a26c63ab2bd458f21d4be774e.tar.gz | |
patch 8.1.2068: test for SafeState and SafeStateAgain may failv8.1.2068
Problem: Test for SafeState and SafeStateAgain may fail.
Solution: Accept more possible responses
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_autocmd.vim | 5 | ||||
| -rw-r--r-- | 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\<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) diff --git a/src/version.c b/src/version.c index d163fbaa4..678bc13d4 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2068, +/**/ 2067, /**/ 2066, |