validate:launcher: Add an option for user to modify timeout values

Allowing to expand the test timeout when running on slow platforms
This commit is contained in:
Thibault Saunier 2017-02-06 12:16:41 -03:00
parent 5d1d8e6971
commit 823ce95d70
2 changed files with 6 additions and 2 deletions

View file

@ -70,11 +70,12 @@ class Test(Loggable):
@hard_timeout: Max time the test can take in absolute
"""
Loggable.__init__(self)
self.timeout = timeout * TIMEOUT_FACTOR
self.timeout = timeout * TIMEOUT_FACTOR * options.timeout_factor
if hard_timeout:
self.hard_timeout = hard_timeout * TIMEOUT_FACTOR
else:
self.hard_timeout = hard_timeout
self.hard_timeout *= options.timeout_factor
self.classname = classname
self.options = options
self.application = application_name

View file

@ -305,7 +305,7 @@ class LauncherConfig(Loggable):
if (self.main_dir != DEFAULT_MAIN_DIR or
self.clone_dir != QA_ASSETS):
local_clone_dir = os.path.join(self.main_dir, self.clone_dir, "testsuites")
if not local_clone_dir in self.testsuites_dirs:
if local_clone_dir not in self.testsuites_dirs:
self.testsuites_dirs.insert(0, local_clone_dir)
if self.valgrind:
try:
@ -386,6 +386,9 @@ Note that all testsuite should be inside python modules, so the directory should
parser.add_argument("-d", "--debug", dest="debug",
action="store_true",
help="Let user debug the process on timeout")
parser.add_argument("--timeout-factor", dest="timeout_factor",
default=1.0, type=float,
help="Factor to be applied on all timeout values.")
parser.add_argument("-f", "--forever", dest="forever",
action="store_true",
help="Keep running tests until one fails")