aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago de Arruda <tpadilha84@gmail.com>2015-02-13 10:28:02 -0300
committerThiago de Arruda <tpadilha84@gmail.com>2015-02-16 23:17:38 -0300
commit98dca8a827cda02bd0cfff1da2a3ca5a0ab8ed7a (patch)
tree0d73b86387ac47da431bdd420cf6fdc93cea8bb6
parent291e15c60a891bfcff42d244e1ababd3e44cb84f (diff)
downloadrneovim-98dca8a827cda02bd0cfff1da2a3ca5a0ab8ed7a.tar.gz
rneovim-98dca8a827cda02bd0cfff1da2a3ca5a0ab8ed7a.tar.bz2
rneovim-98dca8a827cda02bd0cfff1da2a3ca5a0ab8ed7a.zip
test: Increase default_screen_timeout when running on travis
Some screen tests such as system/ctrl+c(viml_system_spec.lua) can take some time to respond(default kill timeout is 2 seconds for an interrupted job) and fail when running under a slow environment such as travis.
-rw-r--r--test/functional/ui/screen.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua
index cd8c2bc399..a20907791b 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -116,7 +116,11 @@ local debug_screen
local default_screen_timeout = 2500
if os.getenv('VALGRIND') then
- default_screen_timeout = 7500
+ default_screen_timeout = default_screen_timeout * 3
+end
+
+if os.getenv('CI_TARGET') then
+ default_screen_timeout = default_screen_timeout * 3
end
local colors = request('vim_get_color_map')