From 9ad79ffcbc2d920a7c2fd395228120eb79a99e5b Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 26 Mar 2015 13:57:34 +0100 Subject: [PATCH] validate: don't increase hard_timeout is if it's None Some tests, like the media check ones, have None as hard_timeout. --- validate/launcher/baseclasses.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/validate/launcher/baseclasses.py b/validate/launcher/baseclasses.py index fb20a4f..2900b24 100644 --- a/validate/launcher/baseclasses.py +++ b/validate/launcher/baseclasses.py @@ -308,7 +308,8 @@ class Test(Loggable): self.proc_env['G_SLICE'] = 'always-malloc' self.add_env_variable('G_SLICE', 'always-malloc') - self.hard_timeout *= VALGRIND_TIMEOUT_FACTOR + if self.hard_timeout is not None: + self.hard_timeout *= VALGRIND_TIMEOUT_FACTOR self.timeout *= VALGRIND_TIMEOUT_FACTOR def test_start(self, queue): -- 2.7.4