test: avoid name collisions with Xtest directory (#23019)

This commit is contained in:
kylo252 2023-04-11 11:18:54 +02:00 committed by GitHub
parent dcaf207336
commit aab95ec67e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 17 deletions

View File

@ -50,6 +50,7 @@ describe('oldtests', function()
it('should fire on unload buf', function() it('should fire on unload buf', function()
funcs.writefile({'Test file Xxx1'}, 'Xxx1') funcs.writefile({'Test file Xxx1'}, 'Xxx1')
funcs.writefile({'Test file Xxx2'}, 'Xxx2') funcs.writefile({'Test file Xxx2'}, 'Xxx2')
local fname = 'Xtest_functional_autocmd_unload'
local content = [[ local content = [[
func UnloadAllBufs() func UnloadAllBufs()
@ -69,15 +70,15 @@ describe('oldtests', function()
q q
]] ]]
funcs.writefile(funcs.split(content, "\n"), 'Xtest') funcs.writefile(funcs.split(content, "\n"), fname)
funcs.delete('Xout') funcs.delete('Xout')
funcs.system(meths.get_vvar('progpath') .. ' -u NORC -i NONE -N -S Xtest') funcs.system(string.format('%s -u NORC -i NONE -N -S %s', meths.get_vvar('progpath'), fname))
eq(1, funcs.filereadable('Xout')) eq(1, funcs.filereadable('Xout'))
funcs.delete('Xxx1') funcs.delete('Xxx1')
funcs.delete('Xxx2') funcs.delete('Xxx2')
funcs.delete('Xtest') funcs.delete(fname)
funcs.delete('Xout') funcs.delete('Xout')
end) end)
end) end)

View File

@ -22,29 +22,30 @@ end
describe('undo tree:', function() describe('undo tree:', function()
before_each(clear) before_each(clear)
local fname = 'Xtest_functional_legacy_undotree'
teardown(function() teardown(function()
os.remove('Xtest.source') os.remove(fname .. '.source')
end) end)
describe(':earlier and :later', function() describe(':earlier and :later', function()
before_each(function() before_each(function()
os.remove('Xtest') os.remove(fname)
end) end)
teardown(function() teardown(function()
os.remove('Xtest') os.remove(fname)
end) end)
it('time specifications, g- g+', function() it('time specifications, g- g+', function()
-- We write the test text to a file in order to prevent nvim to record -- We write the test text to a file in order to prevent nvim to record
-- the inserting of the text into the undo history. -- the inserting of the text into the undo history.
write_file('Xtest', '\n123456789\n') write_file(fname, '\n123456789\n')
-- `:earlier` and `:later` are (obviously) time-sensitive, so this test -- `:earlier` and `:later` are (obviously) time-sensitive, so this test
-- sometimes fails if the system is under load. It is wrapped in a local -- sometimes fails if the system is under load. It is wrapped in a local
-- function to allow multiple attempts. -- function to allow multiple attempts.
local function test_earlier_later() local function test_earlier_later()
clear() clear()
feed_command('e Xtest') feed_command('e ' .. fname)
-- Assert that no undo history is present. -- Assert that no undo history is present.
eq({}, eval('undotree().entries')) eq({}, eval('undotree().entries'))
-- Delete three characters and undo. -- Delete three characters and undo.
@ -103,7 +104,7 @@ describe('undo tree:', function()
it('file-write specifications', function() it('file-write specifications', function()
feed('ione one one<esc>') feed('ione one one<esc>')
feed_command('w Xtest') feed_command('w ' .. fname)
feed('otwo<esc>') feed('otwo<esc>')
feed('otwo<esc>') feed('otwo<esc>')
feed_command('w') feed_command('w')
@ -187,7 +188,7 @@ describe('undo tree:', function()
it('undo an expression-register', function() it('undo an expression-register', function()
local normal_commands = 'o1\027a2\018=string(123)\n\027' local normal_commands = 'o1\027a2\018=string(123)\n\027'
write_file('Xtest.source', normal_commands) write_file(fname .. '.source', normal_commands)
feed('oa<esc>') feed('oa<esc>')
feed('ob<esc>') feed('ob<esc>')
@ -221,7 +222,7 @@ describe('undo tree:', function()
c c
12]]) 12]])
feed('od<esc>') feed('od<esc>')
feed_command('so! Xtest.source') feed_command('so! ' .. fname .. '.source')
expect([[ expect([[
a a

View File

@ -22,6 +22,7 @@ local skip = helpers.skip
describe('ui/ext_messages', function() describe('ui/ext_messages', function()
local screen local screen
local fname = 'Xtest_functional_ui_messages_spec'
before_each(function() before_each(function()
clear() clear()
@ -41,7 +42,7 @@ describe('ui/ext_messages', function()
}) })
end) end)
after_each(function() after_each(function()
os.remove('Xtest') os.remove(fname)
end) end)
it('msg_clear follows msg_show kind of confirm', function() it('msg_clear follows msg_show kind of confirm', function()
@ -126,7 +127,7 @@ describe('ui/ext_messages', function()
feed('nq') feed('nq')
-- kind=wmsg (editing readonly file) -- kind=wmsg (editing readonly file)
command('write Xtest') command('write ' .. fname)
command('set readonly nohls') command('set readonly nohls')
feed('G$x') feed('G$x')
screen:expect{grid=[[ screen:expect{grid=[[
@ -912,9 +913,9 @@ stack traceback:
end) end)
it('does not truncate messages', function() it('does not truncate messages', function()
command('write Xtest') command('write '.. fname)
screen:expect({messages={ screen:expect({messages={
{content = { { '"Xtest" [New] 0L, 0B written' } }, kind = "" } {content = { { string.format('"%s" [New] 0L, 0B written', fname) } }, kind = "" }
}}) }})
end) end)
end) end)

View File

@ -393,7 +393,7 @@ describe('system()', function()
end) end)
describe('with output containing NULs', function() describe('with output containing NULs', function()
local fname = 'Xtest' local fname = 'Xtest_functional_vimscript_system_nuls'
before_each(create_file_with_nuls(fname)) before_each(create_file_with_nuls(fname))
after_each(delete_file(fname)) after_each(delete_file(fname))
@ -549,7 +549,7 @@ describe('systemlist()', function()
end) end)
describe('with output containing NULs', function() describe('with output containing NULs', function()
local fname = 'Xtest' local fname = 'Xtest_functional_vimscript_systemlist_nuls'
before_each(function() before_each(function()
command('set ff=unix') command('set ff=unix')