summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-09-22 21:50:09 +0200
committerBram Moolenaar <Bram@vim.org>2019-09-22 21:50:09 +0200
commitcadbe1b1fbdf7d7740ae617710e0f6862fdee598 (patch)
treefa09b706ee53dff036830a71d56a2d8af2c8be0b
parentc2585490321854ca3df115efcf0b40986901d96c (diff)
patch 8.1.2067: no tests for SafeState and SafeStateAgainv8.1.2067
Problem: No tests for SafeState and SafeStateAgain. Solution: Add tests.
-rw-r--r--src/testdir/test_autocmd.vim31
-rw-r--r--src/version.c2
2 files changed, 33 insertions, 0 deletions
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 0979bb4a15..c3d3bbbd10 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2,6 +2,7 @@
source shared.vim
source check.vim
+source term_util.vim
func s:cleanup_buffers() abort
for bnr in range(1, bufnr('$'))
@@ -2225,3 +2226,33 @@ func Test_throw_in_BufWritePre()
bwipe!
au! throwing
endfunc
+
+func Test_autocmd_SafeState()
+ CheckRunVimInTerminal
+
+ let lines =<< trim END
+ let g:safe = 0
+ let g:again = ''
+ au SafeState * let g:safe += 1
+ au SafeStateAgain * let g:again ..= 'x'
+ func CallTimer()
+ call timer_start(10, {id -> execute('let g:again ..= "t"')})
+ endfunc
+ END
+ call writefile(lines, 'XSafeState')
+ let buf = RunVimInTerminal('-S XSafeState', #{rows: 6})
+
+ call term_sendkeys(buf, ":echo g:safe\<CR>")
+ call WaitForAssert({-> assert_match('^2 ', 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_sendkeys(buf, ":echo g:again\<CR>")
+ call WaitForAssert({-> assert_match('xtx', term_getline(buf, 6))}, 1000)
+
+ call StopVimInTerminal(buf)
+ call delete('XSafeState')
+endfunc
diff --git a/src/version.c b/src/version.c
index 2b2474f301..d163fbaa4d 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 */
/**/
+ 2067,
+/**/
2066,
/**/
2065,