patch 9.0.0363: common names in test files causes tests to be flaky
Problem: Common names in test files causes tests to be flaky.
Solution: Use more specific names.
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index e05268a..cad1d4b 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -375,22 +375,22 @@
" test for shortcut file
if executable('cscript')
- new Xfile
+ new Xresfile
wq
let lines =<< trim END
Set fs = CreateObject("Scripting.FileSystemObject")
Set ws = WScript.CreateObject("WScript.Shell")
Set shortcut = ws.CreateShortcut("Xlink.lnk")
- shortcut.TargetPath = fs.BuildPath(ws.CurrentDirectory, "Xfile")
+ shortcut.TargetPath = fs.BuildPath(ws.CurrentDirectory, "Xresfile")
shortcut.Save
END
call writefile(lines, 'link.vbs')
silent !cscript link.vbs
call delete('link.vbs')
- call assert_equal(s:normalize_fname(getcwd() . '\Xfile'), s:normalize_fname(resolve('./Xlink.lnk')))
- call delete('Xfile')
+ call assert_equal(s:normalize_fname(getcwd() . '\Xresfile'), s:normalize_fname(resolve('./Xlink.lnk')))
+ call delete('Xresfile')
- call assert_equal(s:normalize_fname(getcwd() . '\Xfile'), s:normalize_fname(resolve('./Xlink.lnk')))
+ call assert_equal(s:normalize_fname(getcwd() . '\Xresfile'), s:normalize_fname(resolve('./Xlink.lnk')))
call delete('Xlink.lnk')
else
echomsg 'skipped test for shortcut file'
@@ -399,20 +399,20 @@
" remove files
call delete('Xlink')
call delete('Xdir', 'd')
- call delete('Xfile')
+ call delete('Xresfile')
" test for symbolic link to a file
- new Xfile
+ new Xresfile
wq
- call assert_equal('Xfile', resolve('Xfile'))
- silent !mklink Xlink Xfile
+ call assert_equal('Xresfile', resolve('Xresfile'))
+ silent !mklink Xlink Xresfile
if !v:shell_error
- call assert_equal(s:normalize_fname(getcwd() . '\Xfile'), s:normalize_fname(resolve('./Xlink')))
+ call assert_equal(s:normalize_fname(getcwd() . '\Xresfile'), s:normalize_fname(resolve('./Xlink')))
call delete('Xlink')
else
echomsg 'skipped test for symbolic link to a file'
endif
- call delete('Xfile')
+ call delete('Xresfile')
" test for junction to a directory
call mkdir('Xdir')
@@ -447,9 +447,9 @@
endif
" test for buffer name
- new Xfile
+ new Xbuffile
wq
- silent !mklink Xlink Xfile
+ silent !mklink Xlink Xbuffile
if !v:shell_error
edit Xlink
call assert_equal('Xlink', bufname('%'))
@@ -458,7 +458,7 @@
else
echomsg 'skipped test for buffer name'
endif
- call delete('Xfile')
+ call delete('Xbuffile')
" test for reparse point
call mkdir('Xdir')