diff options
| author | Thibault Saunier <tsaunier@gnome.org> | 2015-08-15 16:23:02 +0200 |
|---|---|---|
| committer | Thibault Saunier <tsaunier@gnome.org> | 2015-08-15 18:30:53 +0200 |
| commit | 367e6cc4f4ea8bd598bb492ed7948419da898e0f (patch) | |
| tree | d59ce425807bfd2163c819eba75921f5bd1ce382 | |
| parent | 233c99fbb774b3817e8927f9c05899d8dc0967d5 (diff) | |
launcher: Make sure MediaDescriptor is set in the GstValidateTest class itself
It is used there but was set in each and every subclasses
| -rw-r--r-- | validate/launcher/apps/gstvalidate.py | 5 | ||||
| -rw-r--r-- | validate/launcher/baseclasses.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/validate/launcher/apps/gstvalidate.py b/validate/launcher/apps/gstvalidate.py index 0bff003..401329a 100644 --- a/validate/launcher/apps/gstvalidate.py +++ b/validate/launcher/apps/gstvalidate.py @@ -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): diff --git a/validate/launcher/baseclasses.py b/validate/launcher/baseclasses.py index eb4a93a..4ec6be7 100644 --- a/validate/launcher/baseclasses.py +++ b/validate/launcher/baseclasses.py @@ -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, |