mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-22 14:06:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate:launcher: Add %(config_path)s in the pipeline desc vars

Browse source 
When defining pipelines_descriptions to run test on in a `.json` file, you might
need to point to paths in the testsuite directory (for media files URIs
for example), you can now do

 `"pipeline": "filesrc location="$(config_path)s/../medias/some/file.mkv...`
This commit is contained in:
Thibault Saunier 2019-01-26 09:19:35 -03:00
parent 2dd8395ee8
commit a3bab7c66e
1 changed files with 38 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -172,7 +172,16 @@ class GstValidatePipelineTestsGenerator(GstValidateTestsGenerator):
""" """
GstValidateTestsGenerator.__init__(self, name, test_manager) GstValidateTestsGenerator.__init__(self, name, test_manager)
self._pipeline_template = pipeline_template self._pipeline_template = pipeline_template
self._pipelines_descriptions = pipelines_descriptions self._pipelines_descriptions = []
for description in pipelines_descriptions or []:
if not isinstance(description, dict):
desc_dict = {"name": description[0],
"pipeline": description[1]}
if len(description) >= 3:
desc_dict["extra_data"] = description[2]
self._pipelines_descriptions.append(desc_dict)
else:
self._pipelines_descriptions.append(description)
self._valid_scenarios = valid_scenarios self._valid_scenarios = valid_scenarios
@classmethod @classmethod
@ -183,9 +192,12 @@ class GstValidatePipelineTestsGenerator(GstValidateTestsGenerator):
name = os.path.basename(json_file).replace('.json', '') name = os.path.basename(json_file).replace('.json', '')
pipelines_descriptions = [] pipelines_descriptions = []
for test_name, defs in descriptions.items(): for test_name, defs in descriptions.items():
pipeline = defs['pipeline'] tests_definition = {'name': test_name, 'pipeline': defs['pipeline']}
scenarios = [] scenarios = []
for scenario in defs['scenarios']: for scenario in defs['scenarios']:
if isinstance(scenario, str):
scenarios.append(scenario)
else:
scenario_name = scenario_file = scenario['name'] scenario_name = scenario_file = scenario['name']
actions = scenario.get('actions') actions = scenario.get('actions')
if actions: if actions:
@ -197,8 +209,9 @@ class GstValidatePipelineTestsGenerator(GstValidateTestsGenerator):
with open(scenario_file, 'w') as f: with open(scenario_file, 'w') as f:
f.write('\n'.join(actions) + '\n') f.write('\n'.join(actions) + '\n')
scenarios.append(scenario_file) scenarios.append(scenario_file)
extra_datas = {'scenarios': scenarios} tests_definition['extra_data'] = {'scenarios': scenarios}
pipelines_descriptions.append([test_name, pipeline, extra_datas]) tests_definition['pipeline_data'] = {"config_path": os.path.dirname(json_file)}
pipelines_descriptions.append(tests_definition)
return GstValidatePipelineTestsGenerator(name, test_manager, pipelines_descriptions=pipelines_descriptions) return GstValidatePipelineTestsGenerator(name, test_manager, pipelines_descriptions=pipelines_descriptions)
@ -228,19 +241,16 @@ class GstValidatePipelineTestsGenerator(GstValidateTestsGenerator):
def populate_tests(self, uri_minfo_special_scenarios, scenarios): def populate_tests(self, uri_minfo_special_scenarios, scenarios):
for description in self._pipelines_descriptions: for description in self._pipelines_descriptions:
name = description[0] pipeline = description['pipeline']
pipeline = description[1] extra_data = description.get('extra_data', {})
if len(description) == 3: pipeline_data = description.get('pipeline_data', {})
extra_datas = description[2]
else:
extra_datas = {}
for scenario in extra_datas.get('scenarios', scenarios): for scenario in extra_data.get('scenarios', scenarios):
if isinstance(scenario, str): if isinstance(scenario, str):
scenario = self.test_manager.scenarios_manager.get_scenario( scenario = self.test_manager.scenarios_manager.get_scenario(
scenario) scenario)
mediainfo = FakeMediaDescriptor(extra_datas, pipeline) mediainfo = FakeMediaDescriptor(extra_data, pipeline)
if not mediainfo.is_compatible(scenario): if not mediainfo.is_compatible(scenario):
continue continue
@ -254,14 +264,14 @@ class GstValidatePipelineTestsGenerator(GstValidateTestsGenerator):
audiosink = 'autoaudiosink' audiosink = 'autoaudiosink'
videosink = 'autovideosink' videosink = 'autovideosink'
pipeline_desc = pipeline % {'videosink': videosink, pipeline_data.update({'videosink': videosink, 'audiosink': audiosink})
'audiosink': audiosink} pipeline_desc = pipeline % pipeline_data
fname = self.get_fname( fname = self.get_fname(
scenario, protocol=mediainfo.get_protocol(), name=name) scenario, protocol=mediainfo.get_protocol(), name=description["name"])
expected_failures = extra_datas.get("expected-failures") expected_failures = extra_data.get("expected-failures")
extra_env_vars = extra_datas.get("extra_env_vars") extra_env_vars = extra_data.get("extra_env_vars")
self.add_test(GstValidateLaunchTest(fname, self.add_test(GstValidateLaunchTest(fname,
self.test_manager.options, self.test_manager.options,
self.test_manager.reporter, self.test_manager.reporter,