thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.1836: autocmd test fails on pacifist systems

Browse Source 
Problem:    Autocmd test fails on pacifist systems.
Solution:   Check that /bin/kill exists. (James McCoy, closes #7117)
            Tune the timing, make the autocmd test run faster.
This commit is contained in:
Bram Moolenaar
2020-10-11 20:08:44 +02:00
parent 6eb36ade98
commit 62cd26a229
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/testdir/test_autocmd.vim
View File

@@ -30,7 +30,7 @@ func Test_CursorHold_autocmd()
call writefile(before, 'Xinit') call writefile(before, 'Xinit')
let buf = RunVimInTerminal('-S Xinit Xfile', {}) let buf = RunVimInTerminal('-S Xinit Xfile', {})
call term_sendkeys(buf, "G") call term_sendkeys(buf, "G")
call term_wait(buf, 20) call term_wait(buf, 50)
call term_sendkeys(buf, "gg") call term_sendkeys(buf, "gg")
call term_wait(buf) call term_wait(buf)
call WaitForAssert({-> assert_equal(['1'], readfile('Xoutput')[-1:-1])}) call WaitForAssert({-> assert_equal(['1'], readfile('Xoutput')[-1:-1])})
@@ -77,9 +77,9 @@ if has('timers')
" CursorHoldI event. " CursorHoldI event.
let g:triggered = 0 let g:triggered = 0
au CursorHoldI * let g:triggered += 1 au CursorHoldI * let g:triggered += 1
set updatetime=500 set updatetime=100
call job_start(has('win32') ? 'cmd /c echo:' : 'echo', call job_start(has('win32') ? 'cmd /c echo:' : 'echo',
\ {'exit_cb': {-> timer_start(1000, 'ExitInsertMode')}}) \ {'exit_cb': {-> timer_start(200, 'ExitInsertMode')}})
call feedkeys('a', 'x!') call feedkeys('a', 'x!')
call assert_equal(1, g:triggered) call assert_equal(1, g:triggered)
unlet g:triggered unlet g:triggered
@@ -452,6 +452,7 @@ func Test_autocmd_bufwipe_in_SessLoadPost()
mksession! mksession!
let content =<< trim [CODE] let content =<< trim [CODE]
call test_override('ui_delay', 10)
set nocp noswapfile set nocp noswapfile
let v:swapchoice="e" let v:swapchoice="e"
augroup test_autocmd_sessionload augroup test_autocmd_sessionload
@@ -2421,6 +2422,8 @@ endfunc
" Test closing a window or editing another buffer from a FileChangedRO handler " Test closing a window or editing another buffer from a FileChangedRO handler
" in a readonly buffer " in a readonly buffer
func Test_FileChangedRO_winclose() func Test_FileChangedRO_winclose()
call test_override('ui_delay', 10)
augroup FileChangedROTest augroup FileChangedROTest
au! au!
autocmd FileChangedRO * quit autocmd FileChangedRO * quit
@@ -2440,6 +2443,7 @@ func Test_FileChangedRO_winclose()
call assert_fails('normal i', 'E788:') call assert_fails('normal i', 'E788:')
close close
augroup! FileChangedROTest augroup! FileChangedROTest
call test_override('ALL', 0)
endfunc endfunc
func LogACmd() func LogACmd()
@@ -2533,6 +2537,7 @@ endfunc
" Tests for SigUSR1 autocmd event, which is only available on posix systems. " Tests for SigUSR1 autocmd event, which is only available on posix systems.
func Test_autocmd_sigusr1() func Test_autocmd_sigusr1()
CheckUnix CheckUnix
CheckExecutable /bin/kill
let g:sigusr1_passed = 0 let g:sigusr1_passed = 0
au SigUSR1 * let g:sigusr1_passed = 1 au SigUSR1 * let g:sigusr1_passed = 1

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1836,
/**/ /**/
1835, 1835,
/**/ /**/