patch 9.0.0323: using common name in tests leads to flaky tests
Problem: Using common name in tests leads to flaky tests.
Solution: Rename files and directories to be more specific.
diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim
index ed4e9d2..6ae2e2f 100644
--- a/src/testdir/test_vim9_import.vim
+++ b/src/testdir/test_vim9_import.vim
@@ -766,10 +766,10 @@
g:result = 49
enddef
END
- mkdir('Xdir/autoload', 'p')
- writefile(lines, 'Xdir/autoload/XautoloadExport.vim')
+ mkdir('Ximpdir/autoload', 'p')
+ writefile(lines, 'Ximpdir/autoload/XautoloadExport.vim')
var save_rtp = &rtp
- exe 'set rtp^=' .. getcwd() .. '/Xdir'
+ exe 'set rtp^=' .. getcwd() .. '/Ximpdir'
lines =<< trim END
vim9script
@@ -786,7 +786,7 @@
unlet g:result
delete('Xmapscript.vim')
nunmap <F3>
- delete('Xdir', 'rf')
+ delete('Ximpdir', 'rf')
&rtp = save_rtp
enddef
@@ -838,9 +838,9 @@
enddef
def Test_use_autoload_import_in_insert_completion()
- mkdir('Xdir/autoload', 'p')
+ mkdir('Xinsdir/autoload', 'p')
var save_rtp = &rtp
- exe 'set rtp^=' .. getcwd() .. '/Xdir'
+ exe 'set rtp^=' .. getcwd() .. '/Xinsdir'
var lines =<< trim END
vim9script
@@ -857,7 +857,7 @@
enddef
g:completion_loaded = 'yes'
END
- writefile(lines, 'Xdir/autoload/completion.vim')
+ writefile(lines, 'Xinsdir/autoload/completion.vim')
new
lines =<< trim END
@@ -874,22 +874,22 @@
set thesaurusfunc=
bwipe!
- delete('Xdir', 'rf')
+ delete('Xinsdir', 'rf')
&rtp = save_rtp
enddef
def Test_use_autoload_import_partial_in_opfunc()
- mkdir('Xdir/autoload', 'p')
+ mkdir('Xpartdir/autoload', 'p')
var save_rtp = &rtp
- exe 'set rtp^=' .. getcwd() .. '/Xdir'
+ exe 'set rtp^=' .. getcwd() .. '/Xpartdir'
var lines =<< trim END
vim9script
- export def Opfunc(..._)
+ export def Opfunc1(..._)
g:opfunc_called = 'yes'
enddef
END
- writefile(lines, 'Xdir/autoload/opfunc.vim')
+ writefile(lines, 'Xpartdir/autoload/opfunc.vim')
new
lines =<< trim END
@@ -897,7 +897,7 @@
import autoload 'opfunc.vim'
nnoremap <expr> <F3> TheFunc()
def TheFunc(): string
- &operatorfunc = function('opfunc.Opfunc', [0])
+ &operatorfunc = function('opfunc.Opfunc1', [0])
return 'g@'
enddef
feedkeys("\<F3>l", 'xt')
@@ -907,23 +907,23 @@
set opfunc=
bwipe!
- delete('Xdir', 'rf')
+ delete('Xpartdir', 'rf')
nunmap <F3>
&rtp = save_rtp
enddef
def Test_set_opfunc_to_autoload_func_directly()
- mkdir('Xdir/autoload', 'p')
+ mkdir('Xdirdir/autoload', 'p')
var save_rtp = &rtp
- exe 'set rtp^=' .. getcwd() .. '/Xdir'
+ exe 'set rtp^=' .. getcwd() .. '/Xdirdir'
var lines =<< trim END
vim9script
- export def Opfunc(..._)
+ export def Opfunc2(..._)
g:opfunc_called = 'yes'
enddef
END
- writefile(lines, 'Xdir/autoload/opfunc.vim')
+ writefile(lines, 'Xdirdir/autoload/opfunc.vim')
new
lines =<< trim END
@@ -931,7 +931,7 @@
import autoload 'opfunc.vim'
nnoremap <expr> <F3> TheFunc()
def TheFunc(): string
- &operatorfunc = opfunc.Opfunc
+ &operatorfunc = opfunc.Opfunc2
return 'g@'
enddef
feedkeys("\<F3>l", 'xt')
@@ -941,15 +941,15 @@
set opfunc=
bwipe!
- delete('Xdir', 'rf')
+ delete('Xdirdir', 'rf')
nunmap <F3>
&rtp = save_rtp
enddef
def Test_use_autoload_import_in_fold_expression()
- mkdir('Xdir/autoload', 'p')
+ mkdir('Xfolddir/autoload', 'p')
var save_rtp = &rtp
- exe 'set rtp^=' .. getcwd() .. '/Xdir'
+ exe 'set rtp^=' .. getcwd() .. '/Xfolddir'
var lines =<< trim END
vim9script
@@ -961,7 +961,7 @@
enddef
g:fold_loaded = 'yes'
END
- writefile(lines, 'Xdir/autoload/fold.vim')
+ writefile(lines, 'Xfolddir/autoload/fold.vim')
lines =<< trim END
vim9script
@@ -985,7 +985,7 @@
set foldexpr= foldtext& foldmethod& debug=
bwipe!
- delete('Xdir', 'rf')
+ delete('Xfolddir', 'rf')
&rtp = save_rtp
enddef
@@ -1200,7 +1200,7 @@
END
v9.CheckScriptFailure(lines, 'E484:')
- delete('Xdir', 'rf')
+ delete('Xa.vim')
enddef
func Test_import_in_diffexpr()
@@ -1455,9 +1455,9 @@
enddef
def Test_export_shadows_global_function()
- mkdir('Xdir/autoload', 'p')
+ mkdir('Xglobdir/autoload', 'p')
var save_rtp = &rtp
- exe 'set rtp^=' .. getcwd() .. '/Xdir'
+ exe 'set rtp^=' .. getcwd() .. '/Xglobdir'
var lines =<< trim END
vim9script
@@ -1465,7 +1465,7 @@
return 'Shadow()'
enddef
END
- writefile(lines, 'Xdir/autoload/shadow.vim')
+ writefile(lines, 'Xglobdir/autoload/shadow.vim')
lines =<< trim END
vim9script
@@ -1481,7 +1481,7 @@
delfunc g:Shadow
bwipe!
- delete('Xdir', 'rf')
+ delete('Xglobdir', 'rf')
&rtp = save_rtp
enddef
@@ -2178,10 +2178,10 @@
enddef
END
- mkdir('Xdir/autoload', 'p')
- writefile(lines, 'Xdir/autoload/some.vim')
+ mkdir('Xfulldir/autoload', 'p')
+ writefile(lines, 'Xfulldir/autoload/some.vim')
var save_rtp = &rtp
- exe 'set rtp^=' .. getcwd() .. '/Xdir'
+ exe 'set rtp^=' .. getcwd() .. '/Xfulldir'
assert_equal('test', g:some#Gettest())
assert_equal('name', g:some#name)
@@ -2198,17 +2198,17 @@
return 'other'
enddef
END
- writefile(lines, 'Xdir/autoload/Other.vim')
+ writefile(lines, 'Xfulldir/autoload/Other.vim')
assert_equal('other', g:Other#GetOther())
- delete('Xdir', 'rf')
+ delete('Xfulldir', 'rf')
&rtp = save_rtp
enddef
def Test_vim9script_autoload()
- mkdir('Xdir/autoload', 'p')
+ mkdir('Xaldir/autoload', 'p')
var save_rtp = &rtp
- exe 'set rtp^=' .. getcwd() .. '/Xdir'
+ exe 'set rtp^=' .. getcwd() .. '/Xaldir'
# when the path has "/autoload/" prefix is not needed
var lines =<< trim END
@@ -2232,7 +2232,7 @@
export final fname = 'final'
export const cname = 'const'
END
- writefile(lines, 'Xdir/autoload/prefixed.vim')
+ writefile(lines, 'Xaldir/autoload/prefixed.vim')
g:prefixed_loaded = 0
g:expected_loaded = 0
@@ -2266,14 +2266,14 @@
unlet g:prefixed_loaded
unlet g:expected_loaded
- delete('Xdir', 'rf')
+ delete('Xaldir', 'rf')
&rtp = save_rtp
enddef
def Test_import_autoload_not_exported()
- mkdir('Xdir/autoload', 'p')
+ mkdir('Xnimdir/autoload', 'p')
var save_rtp = &rtp
- exe 'set rtp^=' .. getcwd() .. '/Xdir'
+ exe 'set rtp^=' .. getcwd() .. '/Xnimdir'
# error when using an item that is not exported from an autoload script
var exportLines =<< trim END
@@ -2283,7 +2283,7 @@
echo 'nop'
enddef
END
- writefile(exportLines, 'Xdir/autoload/notExport1.vim')
+ writefile(exportLines, 'Xnimdir/autoload/notExport1.vim')
var lines =<< trim END
vim9script
@@ -2329,7 +2329,7 @@
# using a :def function we use a different autoload script every time so that
# the function is compiled without the script loaded
- writefile(exportLines, 'Xdir/autoload/notExport2.vim')
+ writefile(exportLines, 'Xnimdir/autoload/notExport2.vim')
lines =<< trim END
vim9script
import autoload 'notExport2.vim'
@@ -2340,7 +2340,7 @@
END
v9.CheckScriptFailure(lines, 'E1048: Item not found in script: notExport2#notFound')
- writefile(exportLines, 'Xdir/autoload/notExport3.vim')
+ writefile(exportLines, 'Xnimdir/autoload/notExport3.vim')
lines =<< trim END
vim9script
import autoload 'notExport3.vim'
@@ -2352,7 +2352,7 @@
# don't get E1049 because it is too complicated to figure out
v9.CheckScriptFailure(lines, 'E1048: Item not found in script: notExport3#notExported')
- writefile(exportLines, 'Xdir/autoload/notExport4.vim')
+ writefile(exportLines, 'Xnimdir/autoload/notExport4.vim')
lines =<< trim END
vim9script
import autoload 'notExport4.vim'
@@ -2363,7 +2363,7 @@
END
v9.CheckScriptFailure(lines, 'E117: Unknown function: notExport4#NotFunc')
- writefile(exportLines, 'Xdir/autoload/notExport5.vim')
+ writefile(exportLines, 'Xnimdir/autoload/notExport5.vim')
lines =<< trim END
vim9script
import autoload 'notExport5.vim'
@@ -2374,7 +2374,7 @@
END
v9.CheckScriptFailure(lines, 'E117: Unknown function: notExport5#NotExport')
- writefile(exportLines, 'Xdir/autoload/notExport6.vim')
+ writefile(exportLines, 'Xnimdir/autoload/notExport6.vim')
lines =<< trim END
vim9script
import autoload 'notExport6.vim'
@@ -2385,7 +2385,7 @@
END
v9.CheckScriptFailure(lines, 'E117: Unknown function: notExport6#NotFunc')
- writefile(exportLines, 'Xdir/autoload/notExport7.vim')
+ writefile(exportLines, 'Xnimdir/autoload/notExport7.vim')
lines =<< trim END
vim9script
import autoload 'notExport7.vim'
@@ -2396,14 +2396,14 @@
END
v9.CheckScriptFailure(lines, 'E117: Unknown function: notExport7#NotExport')
- delete('Xdir', 'rf')
+ delete('Xnimdir', 'rf')
&rtp = save_rtp
enddef
def Test_vim9script_autoload_call()
- mkdir('Xdir/autoload', 'p')
+ mkdir('Xcalldir/autoload', 'p')
var save_rtp = &rtp
- exe 'set rtp^=' .. getcwd() .. '/Xdir'
+ exe 'set rtp^=' .. getcwd() .. '/Xcalldir'
var lines =<< trim END
vim9script
@@ -2416,7 +2416,7 @@
g:result = 'other'
enddef
END
- writefile(lines, 'Xdir/autoload/another.vim')
+ writefile(lines, 'Xcalldir/autoload/another.vim')
lines =<< trim END
vim9script
@@ -2440,14 +2440,14 @@
v9.CheckScriptSuccess(lines)
unlet g:result
- delete('Xdir', 'rf')
+ delete('Xcalldir', 'rf')
&rtp = save_rtp
enddef
def Test_vim9script_noclear_autoload()
- mkdir('Xdir/autoload', 'p')
+ mkdir('Xnocdir/autoload', 'p')
var save_rtp = &rtp
- exe 'set rtp^=' .. getcwd() .. '/Xdir'
+ exe 'set rtp^=' .. getcwd() .. '/Xnocdir'
var lines =<< trim END
vim9script
@@ -2456,7 +2456,7 @@
enddef
g:double_loaded = 'yes'
END
- writefile(lines, 'Xdir/autoload/double.vim')
+ writefile(lines, 'Xnocdir/autoload/double.vim')
lines =<< trim END
vim9script noclear
@@ -2482,12 +2482,12 @@
unlet g:double_loaded
unlet g:script_loaded
unlet g:result
- delete('Xdir', 'rf')
+ delete('Xnocdir', 'rf')
&rtp = save_rtp
enddef
def Test_vim9script_autoload_duplicate()
- mkdir('Xdir/autoload', 'p')
+ mkdir('Xdupdir/autoload', 'p')
var lines =<< trim END
vim9script
@@ -2498,8 +2498,8 @@
def Func()
enddef
END
- writefile(lines, 'Xdir/autoload/dupfunc.vim')
- assert_fails('source Xdir/autoload/dupfunc.vim', 'E1073:')
+ writefile(lines, 'Xdupdir/autoload/dupfunc.vim')
+ assert_fails('source Xdupdir/autoload/dupfunc.vim', 'E1073:')
lines =<< trim END
vim9script
@@ -2510,8 +2510,8 @@
export def Func()
enddef
END
- writefile(lines, 'Xdir/autoload/dup2func.vim')
- assert_fails('source Xdir/autoload/dup2func.vim', 'E1073:')
+ writefile(lines, 'Xdupdir/autoload/dup2func.vim')
+ assert_fails('source Xdupdir/autoload/dup2func.vim', 'E1073:')
lines =<< trim END
vim9script
@@ -2521,8 +2521,8 @@
export var Func = 'asdf'
END
- writefile(lines, 'Xdir/autoload/dup3func.vim')
- assert_fails('source Xdir/autoload/dup3func.vim', 'E1041: Redefining script item: "Func"')
+ writefile(lines, 'Xdupdir/autoload/dup3func.vim')
+ assert_fails('source Xdupdir/autoload/dup3func.vim', 'E1041: Redefining script item: "Func"')
lines =<< trim END
vim9script
@@ -2532,8 +2532,8 @@
def Func()
enddef
END
- writefile(lines, 'Xdir/autoload/dup4func.vim')
- assert_fails('source Xdir/autoload/dup4func.vim', 'E707:')
+ writefile(lines, 'Xdupdir/autoload/dup4func.vim')
+ assert_fails('source Xdupdir/autoload/dup4func.vim', 'E707:')
lines =<< trim END
vim9script
@@ -2543,8 +2543,8 @@
export def Func()
enddef
END
- writefile(lines, 'Xdir/autoload/dup5func.vim')
- assert_fails('source Xdir/autoload/dup5func.vim', 'E707:')
+ writefile(lines, 'Xdupdir/autoload/dup5func.vim')
+ assert_fails('source Xdupdir/autoload/dup5func.vim', 'E707:')
lines =<< trim END
vim9script
@@ -2554,14 +2554,14 @@
var Func = 'asdf'
END
- writefile(lines, 'Xdir/autoload/dup6func.vim')
- assert_fails('source Xdir/autoload/dup6func.vim', 'E1041: Redefining script item: "Func"')
+ writefile(lines, 'Xdupdir/autoload/dup6func.vim')
+ assert_fails('source Xdupdir/autoload/dup6func.vim', 'E1041: Redefining script item: "Func"')
- delete('Xdir', 'rf')
+ delete('Xdupdir', 'rf')
enddef
def Test_autoload_missing_function_name()
- mkdir('Xdir/autoload', 'p')
+ mkdir('Xmisdir/autoload', 'p')
var lines =<< trim END
vim9script
@@ -2569,10 +2569,10 @@
def loadme#()
enddef
END
- writefile(lines, 'Xdir/autoload/loadme.vim')
- assert_fails('source Xdir/autoload/loadme.vim', 'E129:')
+ writefile(lines, 'Xmisdir/autoload/loadme.vim')
+ assert_fails('source Xmisdir/autoload/loadme.vim', 'E129:')
- delete('Xdir', 'rf')
+ delete('Xmisdir', 'rf')
enddef
def Test_autoload_name_wrong()
@@ -2584,22 +2584,22 @@
v9.CheckScriptFailure(lines, 'E746:')
delete('Xscriptname.vim')
- mkdir('Xdir/autoload', 'p')
+ mkdir('Xwrodir/autoload', 'p')
lines =<< trim END
vim9script
def somescript#Func()
enddef
END
- writefile(lines, 'Xdir/autoload/somescript.vim')
- assert_fails('source Xdir/autoload/somescript.vim', 'E1263:')
+ writefile(lines, 'Xwrodir/autoload/somescript.vim')
+ assert_fails('source Xwrodir/autoload/somescript.vim', 'E1263:')
- delete('Xdir', 'rf')
+ delete('Xwrodir', 'rf')
enddef
def Test_import_autoload_postponed()
- mkdir('Xdir/autoload', 'p')
+ mkdir('Xpostdir/autoload', 'p')
var save_rtp = &rtp
- exe 'set rtp^=' .. getcwd() .. '/Xdir'
+ exe 'set rtp^=' .. getcwd() .. '/Xpostdir'
var lines =<< trim END
vim9script
@@ -2610,7 +2610,7 @@
return 'bla'
enddef
END
- writefile(lines, 'Xdir/autoload/postponed.vim')
+ writefile(lines, 'Xpostdir/autoload/postponed.vim')
lines =<< trim END
vim9script
@@ -2628,14 +2628,14 @@
assert_equal('true', g:loaded_postponed)
unlet g:loaded_postponed
- delete('Xdir', 'rf')
+ delete('Xpostdir', 'rf')
&rtp = save_rtp
enddef
def Test_import_autoload_override()
- mkdir('Xdir/autoload', 'p')
+ mkdir('Xoverdir/autoload', 'p')
var save_rtp = &rtp
- exe 'set rtp^=' .. getcwd() .. '/Xdir'
+ exe 'set rtp^=' .. getcwd() .. '/Xoverdir'
test_override('autoload', 1)
var lines =<< trim END
@@ -2647,7 +2647,7 @@
return 'bla'
enddef
END
- writefile(lines, 'Xdir/autoload/override.vim')
+ writefile(lines, 'Xoverdir/autoload/override.vim')
lines =<< trim END
vim9script
@@ -2664,14 +2664,14 @@
test_override('autoload', 0)
unlet g:loaded_override
- delete('Xdir', 'rf')
+ delete('Xoverdir', 'rf')
&rtp = save_rtp
enddef
def Test_autoload_mapping()
- mkdir('Xdir/autoload', 'p')
+ mkdir('Xmapdir/autoload', 'p')
var save_rtp = &rtp
- exe 'set rtp^=' .. getcwd() .. '/Xdir'
+ exe 'set rtp^=' .. getcwd() .. '/Xmapdir'
var lines =<< trim END
vim9script
@@ -2685,7 +2685,7 @@
g:doit_called = 'yes'
enddef
END
- writefile(lines, 'Xdir/autoload/toggle.vim')
+ writefile(lines, 'Xmapdir/autoload/toggle.vim')
lines =<< trim END
vim9script
@@ -2716,7 +2716,7 @@
nunmap yy
unlet g:toggle_loaded
unlet g:toggle_called
- delete('Xdir', 'rf')
+ delete('Xmapdir', 'rf')
&rtp = save_rtp
enddef
@@ -2774,9 +2774,9 @@
" test disassembling an auto-loaded function starting with "debug"
def Test_vim9_autoload_disass()
- mkdir('Xdir/autoload', 'p')
+ mkdir('Xdasdir/autoload', 'p')
var save_rtp = &rtp
- exe 'set rtp^=' .. getcwd() .. '/Xdir'
+ exe 'set rtp^=' .. getcwd() .. '/Xdasdir'
var lines =<< trim END
vim9script
@@ -2784,7 +2784,7 @@
return 'debug'
enddef
END
- writefile(lines, 'Xdir/autoload/debugit.vim')
+ writefile(lines, 'Xdasdir/autoload/debugit.vim')
lines =<< trim END
vim9script
@@ -2792,7 +2792,7 @@
return 'profile'
enddef
END
- writefile(lines, 'Xdir/autoload/profileit.vim')
+ writefile(lines, 'Xdasdir/autoload/profileit.vim')
lines =<< trim END
vim9script
@@ -2803,7 +2803,7 @@
END
v9.CheckScriptSuccess(lines)
- delete('Xdir', 'rf')
+ delete('Xdasdir', 'rf')
&rtp = save_rtp
enddef
@@ -2816,10 +2816,10 @@
enddef
END
- mkdir('Xdir/autoload', 'p')
- writefile(lines, 'Xdir/autoload/foo.vim')
+ mkdir('Xauldir/autoload', 'p')
+ writefile(lines, 'Xauldir/autoload/foo.vim')
var save_rtp = &rtp
- exe 'set rtp^=' .. getcwd() .. '/Xdir'
+ exe 'set rtp^=' .. getcwd() .. '/Xauldir'
augroup test
autocmd TextYankPost * call foo#Test()
augroup END
@@ -2829,7 +2829,7 @@
augroup test
autocmd!
augroup END
- delete('Xdir', 'rf')
+ delete('Xauldir', 'rf')
&rtp = save_rtp
enddef
@@ -2842,10 +2842,10 @@
enddef
END
- mkdir('Xdir/autoload', 'p')
- writefile(lines, 'Xdir/autoload/CaseSensitive.vim')
+ mkdir('Xcasedir/autoload', 'p')
+ writefile(lines, 'Xcasedir/autoload/CaseSensitive.vim')
var save_rtp = &rtp
- exe 'set rtp^=' .. getcwd() .. '/Xdir'
+ exe 'set rtp^=' .. getcwd() .. '/Xcasedir'
lines =<< trim END
vim9script
@@ -2863,7 +2863,7 @@
v9.CheckScriptFailure(lines, 'E1262:')
endif
- delete('Xdir', 'rf')
+ delete('Xcasedir', 'rf')
&rtp = save_rtp
enddef