From 7dd6bc4de2a4056c3f5326a0ae9936c46bea5607 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Thu, 30 Apr 2020 17:44:33 -0400 Subject: [PATCH] ges:tests: Fix the `ignore-fields` format in validatetests They are needed as those are not 100% reproducible with GES. Part-of: --- .../check/scenarios/edit_while_seeked_with_stop.validatetest | 2 +- .../flow-expectations/log-videosink-sink-expected | 2 +- .../scenarios/seek_with_stop.check_clock_sync.validatetest | 2 +- .../flow-expectations/log-videosink-sink-expected | 2 +- tests/check/scenarios/seek_with_stop.validatetest | 4 ++-- .../flow-expectations/log-audiosink-sink-expected | 2 +- .../flow-expectations/log-videosink-sink-expected | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/check/scenarios/edit_while_seeked_with_stop.validatetest b/tests/check/scenarios/edit_while_seeked_with_stop.validatetest index a9866faafb..b2fc4e8c91 100644 --- a/tests/check/scenarios/edit_while_seeked_with_stop.validatetest +++ b/tests/check/scenarios/edit_while_seeked_with_stop.validatetest @@ -9,7 +9,7 @@ meta, ignore-eos=true, configs = { # Ideally we should be able to record checksums... but they are not reproducible - "$(validateflow), pad=videosink:sink, record-buffers=true, ignored-fields={\"stream-start=stream-id,group-id,stream\"}", + "$(validateflow), pad=videosink:sink, record-buffers=true, ignored-fields=\"stream-start={stream-id,group-id,stream}\"", } add-clip, name=c0, asset-id=GESTestClip, layer-priority=0, type=GESTestClip, start=0, duration=1.0 diff --git a/tests/check/scenarios/edit_while_seeked_with_stop/flow-expectations/log-videosink-sink-expected b/tests/check/scenarios/edit_while_seeked_with_stop/flow-expectations/log-videosink-sink-expected index d0a1c44b29..e6bdcebc0a 100644 --- a/tests/check/scenarios/edit_while_seeked_with_stop/flow-expectations/log-videosink-sink-expected +++ b/tests/check/scenarios/edit_while_seeked_with_stop/flow-expectations/log-videosink-sink-expected @@ -1,4 +1,4 @@ -event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, stream=(GstStream)"\(GstStream\)\ stream0", group-id=(uint)2; +event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE; event caps: video/x-raw, format=(string)I420, width=(int)1280, height=(int)720, framerate=(fraction)10/1, chroma-site=(string)mpeg2, colorimetry=(string)bt709; event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:01.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=none buffer: pts=0:00:00.000000000, dur=0:00:00.100000000 diff --git a/tests/check/scenarios/seek_with_stop.check_clock_sync.validatetest b/tests/check/scenarios/seek_with_stop.check_clock_sync.validatetest index 3b28397ef7..c89266a291 100644 --- a/tests/check/scenarios/seek_with_stop.check_clock_sync.validatetest +++ b/tests/check/scenarios/seek_with_stop.check_clock_sync.validatetest @@ -9,7 +9,7 @@ meta, ignore-eos=true, configs = { # Ideally we should be able to record checksums... but they are not reproducible - "$(validateflow), pad=videosink:sink, record-buffers=true, ignored-fields={\"stream-start=stream-id,group-id,stream\"}", + "$(validateflow), pad=videosink:sink, record-buffers=true, ignored-fields=\"stream-start={stream-id,group-id,stream}\"", } add-clip, name=c0, asset-id=GESTestClip, layer-priority=0, type=GESTestClip, start=0, duration=1.0 diff --git a/tests/check/scenarios/seek_with_stop.check_clock_sync/flow-expectations/log-videosink-sink-expected b/tests/check/scenarios/seek_with_stop.check_clock_sync/flow-expectations/log-videosink-sink-expected index f975942b08..4370de58c4 100644 --- a/tests/check/scenarios/seek_with_stop.check_clock_sync/flow-expectations/log-videosink-sink-expected +++ b/tests/check/scenarios/seek_with_stop.check_clock_sync/flow-expectations/log-videosink-sink-expected @@ -1,4 +1,4 @@ -event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, stream=(GstStream)"\(GstStream\)\ stream0", group-id=(uint)2; +event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE; event caps: video/x-raw, format=(string)I420, width=(int)1280, height=(int)720, framerate=(fraction)10/1, chroma-site=(string)mpeg2, colorimetry=(string)bt709; event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:01.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=none buffer: pts=0:00:00.000000000, dur=0:00:00.100000000 diff --git a/tests/check/scenarios/seek_with_stop.validatetest b/tests/check/scenarios/seek_with_stop.validatetest index b1421720f0..58fa43cb48 100644 --- a/tests/check/scenarios/seek_with_stop.validatetest +++ b/tests/check/scenarios/seek_with_stop.validatetest @@ -7,8 +7,8 @@ meta, handles-states=true, ignore-eos=true, configs = { - "$(validateflow), pad=videosink:sink, record-buffers=true, ignored-fields={\"stream-start=stream-id,group-id,stream\"}", - "$(validateflow), pad=audiosink:sink, record-buffers=true, ignored-fields={\"stream-start=stream-id,group-id,stream\"}", + "$(validateflow), pad=videosink:sink, record-buffers=true, ignored-fields=\"stream-start={stream-id,group-id,stream}\"", + "$(validateflow), pad=audiosink:sink, record-buffers=true, ignored-fields=\"stream-start={stream-id,group-id,stream}\"", } add-clip, name=c0, asset-id=GESTestClip, layer-priority=0, type=GESTestClip, start=0, duration=1.0 diff --git a/tests/check/scenarios/seek_with_stop/flow-expectations/log-audiosink-sink-expected b/tests/check/scenarios/seek_with_stop/flow-expectations/log-audiosink-sink-expected index 4ca1455936..f484fef98b 100644 --- a/tests/check/scenarios/seek_with_stop/flow-expectations/log-audiosink-sink-expected +++ b/tests/check/scenarios/seek_with_stop/flow-expectations/log-audiosink-sink-expected @@ -1,4 +1,4 @@ -event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, stream=(GstStream)"\(GstStream\)\ stream1", group-id=(uint)3; +event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE; event caps: audio/x-raw, rate=(int)44100, format=(string)S32LE, channels=(int)2, layout=(string)interleaved, channel-mask=(bitmask)0x0000000000000003; event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:01.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000 buffer: pts=0:00:00.000000000, dur=0:00:00.010000000 diff --git a/tests/check/scenarios/seek_with_stop/flow-expectations/log-videosink-sink-expected b/tests/check/scenarios/seek_with_stop/flow-expectations/log-videosink-sink-expected index 5f11a16f9c..41028541e9 100644 --- a/tests/check/scenarios/seek_with_stop/flow-expectations/log-videosink-sink-expected +++ b/tests/check/scenarios/seek_with_stop/flow-expectations/log-videosink-sink-expected @@ -1,4 +1,4 @@ -event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, stream=(GstStream)"\(GstStream\)\ stream0", group-id=(uint)3; +event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE; event caps: video/x-raw, format=(string)I420, width=(int)1280, height=(int)720, framerate=(fraction)30/1, chroma-site=(string)mpeg2, colorimetry=(string)bt709; event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:01.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=none buffer: pts=0:00:00.000000000, dur=0:00:00.033333333