mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate:launcher: Add a way to define test timeout from dicts

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-devtools/-/merge_requests/172>
This commit is contained in:
Thibault Saunier 2020-03-17 12:19:46 -03:00
parent 31efd7a11c
commit 06793d1d34
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
validate/launcher/apps/gstvalidate.py
View file

@ -265,6 +265,7 @@ class GstValidatePipelineTestsGenerator(GstValidateTestsGenerator):
config_files = {} config_files = {}
config = defs.pop('config', None) config = defs.pop('config', None)
timeout = defs.pop('timeout', DEFAULT_TIMEOUT)
scenario_defs = defs.pop('scenarios', []) scenario_defs = defs.pop('scenarios', [])
if not scenario_defs and config: if not scenario_defs and config:
config_files[None] = cls.get_config_file(config, test_private_dir, test_name, extra_data) config_files[None] = cls.get_config_file(config, test_private_dir, test_name, extra_data)
@ -302,6 +303,7 @@ class GstValidatePipelineTestsGenerator(GstValidateTestsGenerator):
'config_files': config_files, 'config_files': config_files,
'plays-reverse': True, 'plays-reverse': True,
'extra_env_vars': envvars, 'extra_env_vars': envvars,
'timeout': timeout,
}) })
expand_vars_in_dict_recurse(local_extra_data, extra_data) expand_vars_in_dict_recurse(local_extra_data, extra_data)
@ -360,6 +362,7 @@ class GstValidatePipelineTestsGenerator(GstValidateTestsGenerator):
scenarios_to_iterate = scenarios scenarios_to_iterate = scenarios
config_files = extra_data.get('config_files') config_files = extra_data.get('config_files')
timeout = extra_data.get('timeout', DEFAULT_TIMEOUT)
mediainfo = extra_data.get( mediainfo = extra_data.get(
'media_info', FakeMediaDescriptor(extra_data, pipeline)) 'media_info', FakeMediaDescriptor(extra_data, pipeline))
for scenario in scenarios_to_iterate: for scenario in scenarios_to_iterate:
@ -395,6 +398,7 @@ class GstValidatePipelineTestsGenerator(GstValidateTestsGenerator):
self.test_manager.reporter, self.test_manager.reporter,
pipeline_desc, pipeline_desc,
scenario=scenario, scenario=scenario,
timeout=timeout,
media_descriptor=mediainfo, media_descriptor=mediainfo,
expected_issues=expected_issues, expected_issues=expected_issues,
extra_env_variables=extra_env_vars) extra_env_variables=extra_env_vars)