From 08d8e01f213716b9a80fee3623390859e53fa6ef Mon Sep 17 00:00:00 2001
From: Thibault Saunier <tsaunier@gnome.org>
Date: Mon, 9 Mar 2015 18:41:54 +0100
Subject: [PATCH] validate:launcher: Make sure TIMEOUTs do not get converted to
 ERROR

This was a regression introduced in c0e3d2e4f190fc9627897cc3d3d016448cb5dbe9
---
 validate/launcher/baseclasses.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/validate/launcher/baseclasses.py b/validate/launcher/baseclasses.py
index 591e77040a..2ed74d5615 100644
--- a/validate/launcher/baseclasses.py
+++ b/validate/launcher/baseclasses.py
@@ -180,8 +180,7 @@ class Test(Loggable):
             self.set_result(Result.PASSED)
         else:
             self.set_result(Result.FAILED,
-                            "Application returned %d" % (
-                                self.process.returncode))
+                            "Application returned %d" % (self.process.returncode))
 
     def get_current_value(self):
         """
@@ -427,6 +426,7 @@ class GstValidateTest(Test):
         self.debug("%s returncode: %s", self, self.process.returncode)
         if self.result == Result.TIMEOUT:
             self.set_result(Result.TIMEOUT, "Application timed out", "timeout")
+            return
 
         criticals = self.get_validate_criticals_errors()
         if self.process.returncode == 139: