kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

test(fileio_spec): avoid expect_exit() without calling clear() (#21810)

Browse Source 
Since before_each() doesn't call clear() in these tests, after_each()
may call expect_exit() without calling clear() if a test is skipped,
causing frequent test failures on Cirrus CI. Close the session instead.
This commit is contained in:
zeertzjq 2023-01-15 09:34:21 +08:00 committed by GitHub
parent 2f32b19967
commit 6134c1e8a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/functional/core/fileio_spec.lua
View File

@ -22,6 +22,7 @@ local tmpname = helpers.tmpname
local trim = helpers.trim
local currentdir = helpers.funcs.getcwd
local assert_alive = helpers.assert_alive
local check_close = helpers.check_close
local expect_exit = helpers.expect_exit
local write_file = helpers.write_file
local Screen = require('test.functional.ui.screen')
@ -34,7 +35,7 @@ describe('fileio', function()
before_each(function()
end)
after_each(function()
expect_exit(command, ':qall!')
check_close()
os.remove('Xtest_startup_shada')
os.remove('Xtest_startup_file1')
os.remove('Xtest_startup_file1~')
@ -270,7 +271,7 @@ describe('tmpdir', function()
end)
after_each(function()
expect_exit(command, ':qall!')
check_close()
os.remove(testlog)
end)

12
test/functional/helpers.lua
View File

@ -397,9 +397,12 @@ local function remove_args(args, args_rm)
return new_args
end
function module.check_close(old_session)
function module.check_close()
if not session then
return
end
local start_time = luv.now()
old_session:close()
session:close()
luv.update_time() -- Update cached value of luv.now() (libuv: uv_now()).
local end_time = luv.now()
local delta = end_time - start_time
@ -408,12 +411,13 @@ function module.check_close(old_session)
"This indicates a likely problem with the test even if it passed!\n")
io.stdout:flush()
end
session = nil
end
--- @param io_extra used for stdin_fd, see :help ui-option
function module.spawn(argv, merge, env, keep, io_extra)
if session and not keep then
module.check_close(session)
if not keep then
module.check_close()
end
local child_stream = ChildProcessStream.spawn(