aboutsummaryrefslogtreecommitdiff
path: root/test/functional/helpers.lua
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-04-09 19:14:20 +0300
committerZyX <kp-pav@yandex.ru>2017-04-09 19:14:20 +0300
commitdbe67868b53774443521129ef30d74346592e3bb (patch)
tree2e375812cdb1b4d2e7203cf960560507888d2d02 /test/functional/helpers.lua
parentf5be643205e98fcecc41c0b7ce19a5a22f692f2c (diff)
parent26bf6e6f6f8819a758611a88e0c0b04e38d4b915 (diff)
downloadrneovim-dbe67868b53774443521129ef30d74346592e3bb.tar.gz
rneovim-dbe67868b53774443521129ef30d74346592e3bb.tar.bz2
rneovim-dbe67868b53774443521129ef30d74346592e3bb.zip
Merge branch 'master' into rename-execute
Diffstat (limited to 'test/functional/helpers.lua')
-rw-r--r--test/functional/helpers.lua7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 13e6f36510..13b06e7f1b 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -251,12 +251,13 @@ local function retry(max, max_ms, fn)
return result
end
if (max and tries >= max) or (luv.now() - start_time > timeout) then
- break
+ if type(result) == "string" then
+ result = "\nretry() attempts: "..tostring(tries).."\n"..result
+ end
+ error(result)
end
tries = tries + 1
end
- -- Do not use pcall() for the final attempt, let the failure bubble up.
- return fn()
end
local function clear(...)