From a8cc106ba85050dfce7b56b6c70e331c6aba7c8e Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 4 Nov 2011 18:47:10 +0100 Subject: [PATCH] tests: fix tests Since blocks are not on both directions, we need to check in the block callback if we are not blocking on an upstream event and let it pass. --- tests/check/generic/sinks.c | 3 +++ tests/check/gst/gstevent.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/tests/check/generic/sinks.c b/tests/check/generic/sinks.c index 231d6e25da..80d79053d9 100644 --- a/tests/check/generic/sinks.c +++ b/tests/check/generic/sinks.c @@ -772,6 +772,9 @@ pad_blocked_cb (GstPad * pad, GstPadProbeType type, gpointer type_data, g_cond_signal (blocked_cond); g_mutex_unlock (blocked_lock); + if (GST_IS_EVENT (type_data) && GST_EVENT_IS_UPSTREAM (type_data)) + return GST_PAD_PROBE_PASS; + return GST_PAD_PROBE_OK; } diff --git a/tests/check/gst/gstevent.c b/tests/check/gst/gstevent.c index c2d5e158c5..6534e412f0 100644 --- a/tests/check/gst/gstevent.c +++ b/tests/check/gst/gstevent.c @@ -370,6 +370,9 @@ signal_blocked (GstPad * pad, GstPadProbeType type, gpointer type_data, signal_data_signal (data); GST_DEBUG ("signal done %p", data); + if (GST_IS_EVENT (type_data) && GST_EVENT_IS_UPSTREAM (type_data)) + return GST_PAD_PROBE_PASS; + return GST_PAD_PROBE_OK; }