From 4fac7bf9fd561aecc17049c553aeb19898f1acc3 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Mon, 3 Jul 2017 16:36:32 -0400 Subject: [PATCH] validate: launcher: Run rtsp tests against both V1 and V2 https://bugzilla.gnome.org/show_bug.cgi?id=781446 --- validate/data/scenarios/force_rtsp2.scenario | 1 + validate/launcher/apps/gstvalidate.py | 23 ++++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 validate/data/scenarios/force_rtsp2.scenario diff --git a/validate/data/scenarios/force_rtsp2.scenario b/validate/data/scenarios/force_rtsp2.scenario new file mode 100644 index 0000000000..0d957b6d24 --- /dev/null +++ b/validate/data/scenarios/force_rtsp2.scenario @@ -0,0 +1 @@ +set-property, target-element-factory-name="rtspsrc", property-name=default-rtsp-version, property-value=(string)"2-0" diff --git a/validate/launcher/apps/gstvalidate.py b/validate/launcher/apps/gstvalidate.py index 74bf12931d..25fdbf02d0 100644 --- a/validate/launcher/apps/gstvalidate.py +++ b/validate/launcher/apps/gstvalidate.py @@ -346,6 +346,13 @@ class GstValidatePlaybinTestsGenerator(GstValidatePipelineTestsGenerator): cpipe, uri, scenario=scenario, media_descriptor=rtspminfo.media_descriptor)) + fname = self._get_name(scenario, Protocols.RTSP + '2', rtspminfo) + self.add_test(GstValidateRTSPTest( + fname, self.test_manager.options, self.test_manager.reporter, + cpipe, uri, scenario=scenario, + media_descriptor=rtspminfo.media_descriptor, + rtsp2=True)) + class GstValidateMixerTestsGenerator(GstValidatePipelineTestsGenerator): @@ -680,11 +687,19 @@ class GstValidateRTSPTest(GstValidateBaseRTSPTest, GstValidateLaunchTest): def __init__(self, classname, options, reporter, pipeline_desc, local_uri, timeout=DEFAULT_TIMEOUT, scenario=None, - media_descriptor=None): + media_descriptor=None, rtsp2=False): GstValidateLaunchTest.__init__(self, classname, options, reporter, pipeline_desc, timeout, scenario, media_descriptor) GstValidateBaseRTSPTest.__init__(self, local_uri) + self.rtsp2 = rtsp2 + + def get_subproc_env(self): + env = super().get_subproc_env() + if self.rtsp2: + env['GST_VALIDATE_SCENARIO'] = env.get('GST_VALIDATE_SCENARIO', '') + ':' + 'force_rtsp2' + + return env class GstValidateRTSPMediaDesciptor(GstValidateMediaDescriptor): @@ -1051,11 +1066,11 @@ not been tested and explicitely activated if you set use --wanted-tests ALL""") ("http.playback.seek.*vorbis_theora_1_ogg", "https://bugzilla.gnome.org/show_bug.cgi?id=769545"), # RTSP known issues - ('rtsp.playback.reverse.*', + ('rtsp.*playback.reverse.*', 'https://bugzilla.gnome.org/show_bug.cgi?id=626811'), - ('rtsp.playback.seek_with_stop.*', + ('rtsp.*playback.seek_with_stop.*', 'https://bugzilla.gnome.org/show_bug.cgi?id=784298'), - ('rtsp.playback.fast_*', + ('rtsp.*playback.fast_*', 'https://bugzilla.gnome.org/show_bug.cgi?id=754575'), ])