aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2019-07-24 02:50:24 +0200
committerGitHub <noreply@github.com>2019-07-24 02:50:24 +0200
commit8fc93241d680f7c73e3013d679adb70c09cb3d57 (patch)
treee4350cbf9d3e316d1081500fdbd8dcfdeaaaf407
parentb59a1f7b52dee7fb8fe8e4e786d4dd080d789245 (diff)
downloadrneovim-8fc93241d680f7c73e3013d679adb70c09cb3d57.tar.gz
rneovim-8fc93241d680f7c73e3013d679adb70c09cb3d57.tar.bz2
rneovim-8fc93241d680f7c73e3013d679adb70c09cb3d57.zip
tests: fix/improve Screen:expect_unchanged (#10577)
Do not sleep before collecting initial state. Ref: https://github.com/neovim/neovim/pull/10550#issuecomment-513670205
-rw-r--r--test/functional/ui/screen.lua8
-rw-r--r--test/functional/ui/searchhl_spec.lua1
2 files changed, 5 insertions, 4 deletions
diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua
index c067cca048..81a15cada2 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -450,12 +450,12 @@ end
function Screen:expect_unchanged(waittime_ms, ignore_attrs, request_cb)
waittime_ms = waittime_ms and waittime_ms or 100
-- Collect the current screen state.
- self:sleep(waittime_ms, request_cb)
+ self:sleep(0, request_cb)
local kwargs = self:get_snapshot(nil, ignore_attrs)
- -- Wait for potential changes.
- self:sleep(waittime_ms, request_cb)
+
+ -- Check that screen state does not change.
kwargs.unchanged = true
- -- Check that screen state did not change.
+ kwargs.timeout = waittime_ms
self:expect(kwargs)
end
diff --git a/test/functional/ui/searchhl_spec.lua b/test/functional/ui/searchhl_spec.lua
index 9ce26eb788..486de02a09 100644
--- a/test/functional/ui/searchhl_spec.lua
+++ b/test/functional/ui/searchhl_spec.lua
@@ -158,6 +158,7 @@ describe('search highlighting', function()
bar foo baz
]])
feed('/foo')
+ helpers.wait()
screen:expect_unchanged()
end)