launcher: Make sure MediaDescriptor is set in the GstValidateTest class itself

It is used there but was set in each and every subclasses
This commit is contained in:
Thibault Saunier 2015-08-15 16:23:02 +02:00
parent 233c99fbb7
commit 367e6cc4f4
2 changed files with 6 additions and 3 deletions

View file

@ -386,6 +386,7 @@ class GstValidateLaunchTest(GstValidateTest):
scenario=scenario,
timeout=timeout,
hard_timeout=hard_timeout,
media_descriptor=media_descriptor,
extra_env_variables=extra_env_variables)
self.pipeline_desc = pipeline_desc
@ -407,9 +408,9 @@ class GstValidateMediaCheckTest(GstValidateTest):
GstValidateMediaCheckTest, self).__init__(G_V_DISCOVERER_COMMAND, classname,
options, reporter,
timeout=timeout,
media_descriptor=media_descriptor,
extra_env_variables=extra_env_variables)
self._uri = uri
self.media_descriptor = media_descriptor
self._media_info_path = minfo_path
def build_arguments(self):
@ -450,12 +451,12 @@ class GstValidateTranscodingTest(GstValidateTest, GstValidateEncodingTestInterfa
duration=duration,
timeout=timeout,
scenario=scenario,
media_descriptor=media_descriptor,
extra_env_variables=extra_env_variables)
GstValidateEncodingTestInterface.__init__(
self, combination, media_descriptor)
self.media_descriptor = media_descriptor
self.uri = uri
def set_rendering_info(self):

View file

@ -413,7 +413,7 @@ class GstValidateTest(Test):
def __init__(self, application_name, classname,
options, reporter, duration=0,
timeout=DEFAULT_TIMEOUT, scenario=None, hard_timeout=None,
extra_env_variables={}):
media_descriptor=None, extra_env_variables={}):
if not hard_timeout and self.HARD_TIMEOUT_FACTOR:
if timeout:
@ -431,6 +431,8 @@ class GstValidateTest(Test):
if p:
application_name = p
self.media_descriptor = media_descriptor
super(GstValidateTest, self).__init__(application_name, classname,
options, reporter,
duration=duration,