aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-05-18 19:41:14 +0200
committerGitHub <noreply@github.com>2018-05-18 19:41:14 +0200
commit3de81ea35122b1a8a79e56eb6dd17560c8e14644 (patch)
tree7a31ff7367100c7348ca1c214ce5b2b699d3d2c4
parent2ed2939597d217f12f9f6da1877684703aa9301f (diff)
downloadrneovim-3de81ea35122b1a8a79e56eb6dd17560c8e14644.tar.gz
rneovim-3de81ea35122b1a8a79e56eb6dd17560c8e14644.tar.bz2
rneovim-3de81ea35122b1a8a79e56eb6dd17560c8e14644.zip
test: inccommand_spec: retry unreliable test (#8311)
-rw-r--r--test/functional/ui/inccommand_spec.lua15
1 files changed, 10 insertions, 5 deletions
diff --git a/test/functional/ui/inccommand_spec.lua b/test/functional/ui/inccommand_spec.lua
index ee1a3240a2..9cc697a4b6 100644
--- a/test/functional/ui/inccommand_spec.lua
+++ b/test/functional/ui/inccommand_spec.lua
@@ -1846,8 +1846,7 @@ describe("'inccommand' with 'gdefault'", function()
end)
describe(":substitute", function()
- local screen = Screen.new(30,15)
-
+ local screen = Screen.new(30,15)
before_each(function()
clear()
end)
@@ -2471,8 +2470,13 @@ describe(":substitute", function()
:%s/some\(thing\)\@!/every/^ |
]])
end)
+end)
+
+it(':substitute with inccommand during :terminal activity', function()
+ retry(2, nil, function()
+ local screen = Screen.new(30,15)
+ clear()
- it('with inccommand during :terminal activity', function()
command("set cmdwinheight=3")
if iswin() then
feed([[:terminal for /L \%I in (1,1,5000) do @(echo xxx & echo xxx & echo xxx)<cr>]])
@@ -2484,7 +2488,7 @@ describe(":substitute", function()
common_setup(screen, 'split', 'foo bar baz\nbar baz fox\nbar foo baz')
command('wincmd =')
- -- Allow some terminal output.
+ -- Wait for terminal output.
screen:expect([[
bar baz fox |
bar foo ba^z |
@@ -2505,7 +2509,7 @@ describe(":substitute", function()
feed('gg')
feed(':%s/foo/ZZZ')
- sleep(50) -- Allow some terminal activity.
+ sleep(20) -- Allow some terminal activity.
screen:expect([[
{12:ZZZ} bar baz |
bar baz fox |
@@ -2523,5 +2527,6 @@ describe(":substitute", function()
{10:[Preview] }|
:%s/foo/ZZZ^ |
]])
+
end)
end)