From bd936dae4cf8e50ae89398d128cb417a72509492 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Fri, 25 Apr 2014 13:19:19 +0200 Subject: [PATCH] validate:launcher: Properly set error message when sending EOS did not work --- validate/tools/launcher/apps/gst-validate.py | 3 +++ validate/tools/launcher/baseclasses.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/validate/tools/launcher/apps/gst-validate.py b/validate/tools/launcher/apps/gst-validate.py index 9f690e94b5..e9bb03ed48 100644 --- a/validate/tools/launcher/apps/gst-validate.py +++ b/validate/tools/launcher/apps/gst-validate.py @@ -220,6 +220,8 @@ class GstValidateLaunchTest(GstValidateTest): https://bugzilla.gnome.org/show_bug.cgi?id=723868""") return Result.KNOWN_ERROR + self.set_result(Result.FAILED, "Pipeline did not stop 30 Seconds after sending EOS") + return Result.FAILED return self.get_current_position() @@ -309,6 +311,7 @@ class GstValidateTranscodingTest(GstValidateTest): https://bugzilla.gnome.org/show_bug.cgi?id=723868""") return Result.KNOWN_ERROR + self.set_result(Result.FAILED, "Pipeline did not stop 30 Seconds after sending EOS") return Result.FAILED diff --git a/validate/tools/launcher/baseclasses.py b/validate/tools/launcher/baseclasses.py index 5552c096b2..fad536e442 100644 --- a/validate/tools/launcher/baseclasses.py +++ b/validate/tools/launcher/baseclasses.py @@ -169,7 +169,6 @@ class Test(Loggable): break continue elif val is Result.FAILED: - self.set_result(Result.FAILED) break elif val is Result.KNOWN_ERROR: break @@ -183,7 +182,7 @@ class Test(Loggable): self.set_result(Result.TIMEOUT) break elif self.hard_timeout and time.time() - start_ts > self.hard_timeout: - self.set_result(Result.TIMEOUT) + self.set_result(Result.TIMEOUT, "Hard timeout reached: %d", self.hard_timeout) break else: last_change_ts = time.time() @@ -703,6 +702,7 @@ class ScenarioManager(Loggable): Loggable.__init__(cls._instance) return cls._instance + def _discover_scenarios(self): scenario_defs = os.path.join(self.config.main_dir, "scenarios.def") try: