validate:launcher: Properly set error message when sending EOS did not work

This commit is contained in:
Thibault Saunier 2014-04-25 13:19:19 +02:00
parent da6dc3882b
commit bd936dae4c
2 changed files with 5 additions and 2 deletions

View file

@ -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

View file

@ -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: