vim-patch:9.0.0428: autocmd test uses common file name

Problem:    Autocmd test uses common file name.
Solution:   Use unique name to reduce flakiness.

be9fc5b60c

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq
2023-08-22 18:17:03 +08:00
parent 1da705c433
commit 48722ec400
2 changed files with 25 additions and 25 deletions

View File

@@ -964,7 +964,7 @@ func Test_autocmd_bufwipe_in_SessLoadPost()
augroup END
func WriteErrors()
call writefile([execute("messages")], "Xerrors")
call writefile([execute("messages")], "XerrorsBwipe")
endfunc
au VimLeave * call WriteErrors()
[CODE]
@@ -972,11 +972,11 @@ func Test_autocmd_bufwipe_in_SessLoadPost()
call writefile(content, 'Xvimrc', 'D')
call system(GetVimCommand('Xvimrc') .. ' --headless --noplugins -S Session.vim -c cq')
sleep 100m
let errors = join(readfile('Xerrors'))
let errors = join(readfile('XerrorsBwipe'))
call assert_match('E814:', errors)
set swapfile
for file in ['Session.vim', 'Xerrors']
for file in ['Session.vim', 'XerrorsBwipe']
call delete(file)
endfor
endfunc
@@ -989,16 +989,16 @@ func Test_autocmd_blast_badd()
edit foo1
au BufNew,BufAdd,BufWinEnter,BufEnter,BufLeave,BufWinLeave,BufUnload,VimEnter foo* ball
edit foo2
call writefile(['OK'], 'Xerrors')
call writefile(['OK'], 'XerrorsBlast')
qall
[CODE]
call writefile(content, 'XblastBall', 'D')
call system(GetVimCommand() .. ' --clean -S XblastBall')
sleep 100m
call assert_match('OK', readfile('Xerrors')->join())
call assert_match('OK', readfile('XerrorsBlast')->join())
call delete('Xerrors')
call delete('XerrorsBlast')
endfunc
" SEGV occurs in older versions.
@@ -1025,7 +1025,7 @@ func Test_autocmd_bufwipe_in_SessLoadPost2()
au SessionLoadPost * call DeleteInactiveBufs()
func WriteErrors()
call writefile([execute("messages")], "Xerrors")
call writefile([execute("messages")], "XerrorsPost")
endfunc
au VimLeave * call WriteErrors()
[CODE]
@@ -1033,13 +1033,13 @@ func Test_autocmd_bufwipe_in_SessLoadPost2()
call writefile(content, 'Xvimrc', 'D')
call system(GetVimCommand('Xvimrc') .. ' --headless --noplugins -S Session.vim -c cq')
sleep 100m
let errors = join(readfile('Xerrors'))
let errors = join(readfile('XerrorsPost'))
" This probably only ever matches on unix.
call assert_notmatch('Caught deadly signal SEGV', errors)
call assert_match('SessionLoadPost DONE', errors)
set swapfile
for file in ['Session.vim', 'Xerrors']
for file in ['Session.vim', 'XerrorsPost']
call delete(file)
endfor
endfunc

View File

@@ -295,9 +295,9 @@ func Test_q_arg()
call writefile(lines, 'Xbadfile.c')
let after =<< trim [CODE]
call writefile([&errorfile, string(getpos("."))], "Xtestout")
call writefile([&errorfile, string(getpos("."))], "XtestoutQarg")
copen
w >> Xtestout
w >> XtestoutQarg
qall
[CODE]
@@ -305,30 +305,30 @@ func Test_q_arg()
call assert_equal('errors.err', &errorfile)
call writefile(["Xbadfile.c:4:12: error: expected ';' before '}' token"], 'errors.err')
if RunVim([], after, '-q')
let lines = readfile('Xtestout')
let lines = readfile('XtestoutQarg')
call assert_equal(['errors.err',
\ '[0, 4, 12, 0]',
\ "Xbadfile.c|4 col 12| error: expected ';' before '}' token"],
\ lines)
endif
call delete('Xtestout')
call delete('XtestoutQarg')
call delete('errors.err')
" Test with explicit argument '-q Xerrors' (with space).
call writefile(["Xbadfile.c:4:12: error: expected ';' before '}' token"], 'Xerrors')
if RunVim([], after, '-q Xerrors')
let lines = readfile('Xtestout')
call assert_equal(['Xerrors',
" Test with explicit argument '-q XerrorsQarg' (with space).
call writefile(["Xbadfile.c:4:12: error: expected ';' before '}' token"], 'XerrorsQarg')
if RunVim([], after, '-q XerrorsQarg')
let lines = readfile('XtestoutQarg')
call assert_equal(['XerrorsQarg',
\ '[0, 4, 12, 0]',
\ "Xbadfile.c|4 col 12| error: expected ';' before '}' token"],
\ lines)
endif
call delete('Xtestout')
call delete('XtestoutQarg')
" Test with explicit argument '-qXerrors' (without space).
if RunVim([], after, '-qXerrors')
let lines = readfile('Xtestout')
call assert_equal(['Xerrors',
" Test with explicit argument '-qXerrorsQarg' (without space).
if RunVim([], after, '-qXerrorsQarg')
let lines = readfile('XtestoutQarg')
call assert_equal(['XerrorsQarg',
\ '[0, 4, 12, 0]',
\ "Xbadfile.c|4 col 12| error: expected ';' before '}' token"],
\ lines)
@@ -339,8 +339,8 @@ func Test_q_arg()
call assert_equal(3, v:shell_error)
call delete('Xbadfile.c')
call delete('Xtestout')
call delete('Xerrors')
call delete('XtestoutQarg')
call delete('XerrorsQarg')
endfunc
" Test the -V[N]{filename} argument to set the 'verbose' option to N