mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-15 19:05:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: don't use minimal timeout for "intermediate" flag (#27620)

Browse Source 
With "intermediate" flag, only using minimal timeout is too short and
may lead to failures.
Also remove the fallback timeout in screen:expect_unchanged(), as having
a different fallback timeout than screen:expect() is confusing.
This commit is contained in:
zeertzjq
2024-02-25 13:35:24 +08:00
committed by GitHub
parent 2e1f5055ac
commit b72dc2d8ad
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/functional/ui/screen.lua
View File

@@ -638,7 +638,6 @@ screen:redraw_debug() to show all intermediate screen states.]]
end
function Screen:expect_unchanged(intermediate, waittime_ms, ignore_attrs)
waittime_ms = waittime_ms and waittime_ms or 100
-- Collect the current screen state.
local kwargs = self:get_snapshot(nil, ignore_attrs)
@@ -689,8 +688,8 @@ function Screen:_wait(check, flags)
-- For an "unchanged" test, flags.timeout is the time during which the state
-- must not change, so always wait this full time.
if (flags.unchanged or flags.intermediate) and flags.timeout then
minimal_timeout = timeout
if flags.unchanged then
minimal_timeout = flags.timeout or default_timeout_factor * 20
end
assert(timeout >= minimal_timeout)
@@ -711,12 +710,12 @@ function Screen:_wait(check, flags)
intermediate_seen = true
end
if not err then
if not err and (not flags.intermediate or intermediate_seen) then
success_seen = true
if did_minimal_timeout then
self._session:stop()
end
elseif success_seen and #args > 0 then
elseif err and success_seen and #args > 0 then
success_seen = false
failure_after_success = true
-- print(inspect(args))