From add38d537c7cabeb248a13a57aaf6aa5441c9d3c Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Thu, 21 Apr 2022 10:21:37 -0400 Subject: [PATCH] tests: convertscale: Do not log EOS events in validateflow We already checked that we are getting an EOS before going back to ready and adding the EOS at the end of the .validateflow is racy as the ERROR message might reach the bus before it is logged. Part-of: --- .../validate/convertscale/convert_disable_scale.validatetest | 2 +- .../flow-expectations/log-converter-src-expected | 2 -- .../validate/convertscale/scale_disable_convert.validatetest | 4 ++-- .../flow-expectations/log-scaler-src-expected | 2 -- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/subprojects/gst-plugins-base/tests/validate/convertscale/convert_disable_scale.validatetest b/subprojects/gst-plugins-base/tests/validate/convertscale/convert_disable_scale.validatetest index 8570000665..e51a0dfa1d 100644 --- a/subprojects/gst-plugins-base/tests/validate/convertscale/convert_disable_scale.validatetest +++ b/subprojects/gst-plugins-base/tests/validate/convertscale/convert_disable_scale.validatetest @@ -6,7 +6,7 @@ meta, "videotestsrc num-buffers=1 ! video/x-raw,format=ARGB,width=20,height=20 ! videoconvert name=converter ! video/x-raw,format=I420,width=100,height=100 ! fakevideosink", }, configs = { - "$(validateflow), pad=converter:src, buffers-checksum=as-id, ignored-event-types={ tag }", + "$(validateflow), pad=converter:src, buffers-checksum=as-id, ignored-event-types={ tag, eos }", }, expected-issues = { [ diff --git a/subprojects/gst-plugins-base/tests/validate/convertscale/convert_disable_scale/flow-expectations/log-converter-src-expected b/subprojects/gst-plugins-base/tests/validate/convertscale/convert_disable_scale/flow-expectations/log-converter-src-expected index 0db91d16ba..51f5b7fea2 100644 --- a/subprojects/gst-plugins-base/tests/validate/convertscale/convert_disable_scale/flow-expectations/log-converter-src-expected +++ b/subprojects/gst-plugins-base/tests/validate/convertscale/convert_disable_scale/flow-expectations/log-converter-src-expected @@ -2,6 +2,4 @@ event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_N event caps: video/x-raw, format=(string)I420, framerate=(fraction)30/1, height=(int)100, interlace-mode=(string)progressive, multiview-mode=(string)mono, pixel-aspect-ratio=(fraction)1/1, width=(int)100; event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=none, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000 buffer: content-id=0, pts=0:00:00.000000000, dur=0:00:00.033333333, flags=discont, meta=GstVideoMeta -event eos: (no structure) event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)2; -event eos: (no structure) diff --git a/subprojects/gst-plugins-base/tests/validate/convertscale/scale_disable_convert.validatetest b/subprojects/gst-plugins-base/tests/validate/convertscale/scale_disable_convert.validatetest index 3088b624d8..560916f416 100644 --- a/subprojects/gst-plugins-base/tests/validate/convertscale/scale_disable_convert.validatetest +++ b/subprojects/gst-plugins-base/tests/validate/convertscale/scale_disable_convert.validatetest @@ -6,7 +6,7 @@ meta, "videotestsrc num-buffers=1 ! video/x-raw,format=ARGB,width=20,height=20 ! videoscale name=scaler ! video/x-raw,format=I420,width=100,height=100 ! fakevideosink", }, configs = { - "$(validateflow), pad=scaler:src, buffers-checksum=as-id, ignored-event-types={ tag }", + "$(validateflow), pad=scaler:src, buffers-checksum=as-id, ignored-event-types={ tag, eos }", }, expected-issues = { [ @@ -28,7 +28,7 @@ meta, play -set-state, state=ready, on-message=eos +set-state, state=ready, on-message=eos set-properties, scaler::disable-conversion=true play diff --git a/subprojects/gst-plugins-base/tests/validate/convertscale/scale_disable_convert/flow-expectations/log-scaler-src-expected b/subprojects/gst-plugins-base/tests/validate/convertscale/scale_disable_convert/flow-expectations/log-scaler-src-expected index 0db91d16ba..51f5b7fea2 100644 --- a/subprojects/gst-plugins-base/tests/validate/convertscale/scale_disable_convert/flow-expectations/log-scaler-src-expected +++ b/subprojects/gst-plugins-base/tests/validate/convertscale/scale_disable_convert/flow-expectations/log-scaler-src-expected @@ -2,6 +2,4 @@ event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_N event caps: video/x-raw, format=(string)I420, framerate=(fraction)30/1, height=(int)100, interlace-mode=(string)progressive, multiview-mode=(string)mono, pixel-aspect-ratio=(fraction)1/1, width=(int)100; event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=none, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000 buffer: content-id=0, pts=0:00:00.000000000, dur=0:00:00.033333333, flags=discont, meta=GstVideoMeta -event eos: (no structure) event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)2; -event eos: (no structure)