Mercurial > vim
diff src/testdir/vim9.vim @ 23247:f2d05fb28e54 v8.2.2169
patch 8.2.2169: Vim9: test leaves file behind
Commit: https://github.com/vim/vim/commit/090728ad4d54287c911894ef42bfe92844ce0fa5
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Dec 20 15:43:31 2020 +0100
patch 8.2.2169: Vim9: test leaves file behind
Problem: Vim9: test leaves file behind.
Solution: Rename script files. (Dominique Pell?, closes https://github.com/vim/vim/issues/7511)
Use try/finally.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 20 Dec 2020 15:45:05 +0100 |
| parents | c713358da074 |
| children | e8c379b20765 |
line wrap: on
line diff
--- a/src/testdir/vim9.vim +++ b/src/testdir/vim9.vim @@ -5,13 +5,18 @@ let s:sequence = 1 " Check that "lines" inside a ":def" function has no error. func CheckDefSuccess(lines) - let fname = 'Xdef' .. s:sequence + let cwd = getcwd() + let fname = 'XdefSuccess' .. s:sequence let s:sequence += 1 call writefile(['def Func()'] + a:lines + ['enddef', 'defcompile'], fname) - exe 'so ' .. fname - call Func() - delfunc! Func - call delete(fname) + try + exe 'so ' .. fname + call Func() + delfunc! Func + finally + call chdir(cwd) + call delete(fname) + endtry endfunc " Check that "lines" inside ":def" results in an "error" message. @@ -19,12 +24,17 @@ endfunc " Add a line before and after to make it less likely that the line number is " accidentally correct. func CheckDefFailure(lines, error, lnum = -3) - let fname = 'Xdef' .. s:sequence + let cwd = getcwd() + let fname = 'XdefFailure' .. s:sequence + let s:sequence += 1 call writefile(['def Func()', '# comment'] + a:lines + ['#comment', 'enddef', 'defcompile'], fname) - call assert_fails('so ' .. fname, a:error, a:lines, a:lnum + 1) - delfunc! Func - call delete(fname) - let s:sequence += 1 + try + call assert_fails('so ' .. fname, a:error, a:lines, a:lnum + 1) + finally + call chdir(cwd) + call delete(fname) + delfunc! Func + endtry endfunc " Check that "lines" inside ":def" results in an "error" message when executed. @@ -32,29 +42,44 @@ endfunc " Add a line before and after to make it less likely that the line number is " accidentally correct. func CheckDefExecFailure(lines, error, lnum = -3) - let fname = 'Xdef' .. s:sequence + let cwd = getcwd() + let fname = 'XdefExecFailure' .. s:sequence let s:sequence += 1 call writefile(['def Func()', '# comment'] + a:lines + ['#comment', 'enddef'], fname) - exe 'so ' .. fname - call assert_fails('call Func()', a:error, a:lines, a:lnum + 1) - delfunc! Func - call delete(fname) + try + exe 'so ' .. fname + call assert_fails('call Func()', a:error, a:lines, a:lnum + 1) + finally + call chdir(cwd) + call delete(fname) + delfunc! Func + endtry endfunc def CheckScriptFailure(lines: list<string>, error: string, lnum = -3) - var fname = 'Xdef' .. s:sequence + var cwd = getcwd() + var fname = 'XScriptFailure' .. s:sequence s:sequence += 1 writefile(lines, fname) - assert_fails('so ' .. fname, error, lines, lnum) - delete(fname) + try + assert_fails('so ' .. fname, error, lines, lnum) + finally + chdir(cwd) + delete(fname) + endtry enddef def CheckScriptSuccess(lines: list<string>) - var fname = 'Xdef' .. s:sequence + var cwd = getcwd() + var fname = 'XScriptSuccess' .. s:sequence s:sequence += 1 writefile(lines, fname) - exe 'so ' .. fname - delete(fname) + try + exe 'so ' .. fname + finally + chdir(cwd) + delete(fname) + endtry enddef def CheckDefAndScriptSuccess(lines: list<string>)