From 1e39db18adb08b209134268d585ab5bef8cfa35f Mon Sep 17 00:00:00 2001
From: Thibault Saunier <tsaunier@gnome.org>
Date: Mon, 8 Dec 2014 18:23:10 +0100
Subject: [PATCH] validate: launcher: Take the timeout as ref timeout to
 compute hard_timeout

when it is provided.
---
 validate/launcher/baseclasses.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/validate/launcher/baseclasses.py b/validate/launcher/baseclasses.py
index 9a091b9347..64d3647146 100644
--- a/validate/launcher/baseclasses.py
+++ b/validate/launcher/baseclasses.py
@@ -296,15 +296,18 @@ class GstValidateTest(Test):
                  timeout=DEFAULT_TIMEOUT, scenario=None, hard_timeout=None):
 
         if not hard_timeout and self.HARD_TIMEOUT_FACTOR:
-            if duration:
+            if timeout:
+                hard_timeout = timeout * self.HARD_TIMEOUT_FACTOR
+            elif duration:
                 hard_timeout = duration * self.HARD_TIMEOUT_FACTOR
             else:
                 hard_timeout = None
 
-        super(
-            GstValidateTest, self).__init__(application_name, classname, options,
-                                            reporter, duration=duration,
-                                            timeout=timeout, hard_timeout=hard_timeout)
+        super(GstValidateTest, self).__init__(application_name, classname,
+                                              options, reporter,
+                                              duration=duration,
+                                              timeout=timeout,
+                                              hard_timeout=hard_timeout)
 
         # defines how much the process can be outside of the configured
         # segment / seek