integration/ges: Ignore GstStream for validate tests

Requires the ges runner to be configured in such a way that the resulting
stream-id is consistent (and therefore can be checked)

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1187>

diff --git a/subprojects/gst-integration-testsuites/ges/scenarios/check_set_inpoint_on_nested_timeline.validatetest b/subprojects/gst-integration-testsuites/ges/scenarios/check_set_inpoint_on_nested_timeline.validatetest
index c0d8013..137732a 100644 (file)
--- a/subprojects/gst-integration-testsuites/ges/scenarios/check_set_inpoint_on_nested_timeline.validatetest
+++ b/subprojects/gst-integration-testsuites/ges/scenarios/check_set_inpoint_on_nested_timeline.validatetest
@@ -7,7 +7,7 @@ meta, seek=true, handles-states=true, needs_preroll=true,
         --videosink, "$(videosink) name=videosink",
     },
     configs = {
-        "$(validateflow), pad=videosink:sink, buffers-checksum=true, ignored-fields=\"stream-start={stream-id,group-id}\"",
+        "$(validateflow), pad=videosink:sink, buffers-checksum=true, ignored-fields=\"stream-start={stream-id,group-id,stream}\"",
     }
 
 set-vars,\

diff --git a/subprojects/gst-integration-testsuites/ges/scenarios/check_set_inpoint_on_nested_timeline/flow-expectations/log-videosink-sink-expected b/subprojects/gst-integration-testsuites/ges/scenarios/check_set_inpoint_on_nested_timeline/flow-expectations/log-videosink-sink-expected
index c14a855..9e3c75a 100644 (file)
--- a/subprojects/gst-integration-testsuites/ges/scenarios/check_set_inpoint_on_nested_timeline/flow-expectations/log-videosink-sink-expected
+++ b/subprojects/gst-integration-testsuites/ges/scenarios/check_set_inpoint_on_nested_timeline/flow-expectations/log-videosink-sink-expected
@@ -1,4 +1,4 @@
-event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, stream=(GstStream)"\(GstStream\)\ stream0";
+event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE;
 event caps: video/x-raw, chroma-site=(string)jpeg, colorimetry=(string)1:4:0:0, format=(string)I420, framerate=(fraction)1/1, height=(int)720, width=(int)1080;
 event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:20.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=none
 buffer: checksum=68cc0c0b6d6863a135f40297a54aec9f1593f34c, pts=0:00:00.000000000, dur=0:00:01.000000000

diff --git a/subprojects/gst-integration-testsuites/ges/scenarios/play_two_nested_back_to_back.validatetest b/subprojects/gst-integration-testsuites/ges/scenarios/play_two_nested_back_to_back.validatetest
index f9b6a54..a846a23 100644 (file)
--- a/subprojects/gst-integration-testsuites/ges/scenarios/play_two_nested_back_to_back.validatetest
+++ b/subprojects/gst-integration-testsuites/ges/scenarios/play_two_nested_back_to_back.validatetest
@@ -10,7 +10,7 @@ meta,
         --videosink, "$(videosink) name=videosink",
     },
     configs = {
-        "$(validateflow), pad=videosink:sink, buffers-checksum=true, ignored-fields=\"stream-start={stream-id,group-id}\"",
+        "$(validateflow), pad=videosink:sink, buffers-checksum=true, ignored-fields=\"stream-start={stream-id,group-id,stream}\"",
     }
 
 set-vars, nested_timeline_uri="file://$(logsdir)/ges/scenarios/$(test_name)/nested_timeline.xges"

diff --git a/subprojects/gst-integration-testsuites/ges/scenarios/play_two_nested_back_to_back/flow-expectations/log-videosink-sink-expected b/subprojects/gst-integration-testsuites/ges/scenarios/play_two_nested_back_to_back/flow-expectations/log-videosink-sink-expected
index da121ce..b4a1d60 100644 (file)
--- a/subprojects/gst-integration-testsuites/ges/scenarios/play_two_nested_back_to_back/flow-expectations/log-videosink-sink-expected
+++ b/subprojects/gst-integration-testsuites/ges/scenarios/play_two_nested_back_to_back/flow-expectations/log-videosink-sink-expected
@@ -1,4 +1,4 @@
-event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, stream=(GstStream)"\(GstStream\)\ stream0";
+event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE;
 event caps: video/x-raw, chroma-site=(string)jpeg, colorimetry=(string)bt601, format=(string)I420, framerate=(fraction)1/1, height=(int)720, width=(int)1080;
 event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:02.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=none
 buffer: checksum=68cc0c0b6d6863a135f40297a54aec9f1593f34c, pts=0:00:00.000000000, dur=0:00:01.000000000

diff --git a/subprojects/gst-integration-testsuites/ges/scenarios/seek_on_stack_change_on_internal_subtimeline.validatetest b/subprojects/gst-integration-testsuites/ges/scenarios/seek_on_stack_change_on_internal_subtimeline.validatetest
index 2f32b26..f7e24a1 100644 (file)
--- a/subprojects/gst-integration-testsuites/ges/scenarios/seek_on_stack_change_on_internal_subtimeline.validatetest
+++ b/subprojects/gst-integration-testsuites/ges/scenarios/seek_on_stack_change_on_internal_subtimeline.validatetest
@@ -9,7 +9,7 @@ meta,
         --videosink, "$(videosink) name=videosink",
     },
     configs = {
-        "$(validateflow), pad=videosink:sink, buffers-checksum=true, ignored-fields=\"stream-start={stream-id,group-id}\"",
+        "$(validateflow), pad=videosink:sink, buffers-checksum=true, ignored-fields=\"stream-start={stream-id,group-id,stream}\"",
     }
 
 set-vars, nested_timeline_uri="file://$(logsdir)/ges/scenarios/$(test_name)/nested_timeline.xges"

diff --git a/subprojects/gst-integration-testsuites/ges/scenarios/seek_on_stack_change_on_internal_subtimeline/flow-expectations/log-videosink-sink-expected b/subprojects/gst-integration-testsuites/ges/scenarios/seek_on_stack_change_on_internal_subtimeline/flow-expectations/log-videosink-sink-expected
index 9e95bd6..152e6d6 100644 (file)
--- a/subprojects/gst-integration-testsuites/ges/scenarios/seek_on_stack_change_on_internal_subtimeline/flow-expectations/log-videosink-sink-expected
+++ b/subprojects/gst-integration-testsuites/ges/scenarios/seek_on_stack_change_on_internal_subtimeline/flow-expectations/log-videosink-sink-expected
@@ -1,4 +1,4 @@
-event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, stream=(GstStream)"\(GstStream\)\ stream0";
+event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE;
 event caps: video/x-raw, chroma-site=(string)jpeg, colorimetry=(string)1:4:0:0, format=(string)I420, framerate=(fraction)1/1, height=(int)720, width=(int)1080;
 event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:04.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=none
 buffer: checksum=9b42849e45e15981115cff9da00ecbf7afafd462, pts=0:00:00.000000000, dur=0:00:01.000000000