summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorEdward Hervey <edward.hervey@collabora.co.uk>2011-10-10 17:14:21 +0200
committerEdward Hervey <edward.hervey@collabora.co.uk>2011-10-10 17:14:21 +0200
commit1e687ed6f60c67ea89dadc428ffb3fdd98862aa3 (patch)
tree3f42a47ca6ad6ffb7fe1c60a57ad740178ea9c99 /tests
parent87bb00561b0076e779982da28b7d5b51fca84685 (diff)
check: Use a probe to detect events
... and not a pad block
Diffstat (limited to 'tests')
-rw-r--r--tests/check/gnl/seek.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/check/gnl/seek.c b/tests/check/gnl/seek.c
index 739014e..d579ec8 100644
--- a/tests/check/gnl/seek.c
+++ b/tests/check/gnl/seek.c
@@ -51,7 +51,7 @@ fill_pipeline_and_check (GstElement * comp, GList * segments, GList * seeks)
G_CALLBACK (composition_pad_added_cb), collect);
sinkpad = gst_element_get_static_pad (sink, "sink");
- gst_pad_add_probe (sinkpad, GST_PROBE_TYPE_BLOCKING,
+ gst_pad_add_probe (sinkpad, GST_PROBE_TYPE_EVENT,
(GstPadProbeCallback) sinkpad_probe, collect, NULL);
bus = gst_element_get_bus (GST_ELEMENT (pipeline));
@@ -83,13 +83,15 @@ fill_pipeline_and_check (GstElement * comp, GList * segments, GList * seeks)
break;
case GST_MESSAGE_ASYNC_DONE:
GST_DEBUG ("prerolling done");
+
if (seeks == NULL) {
carry_on = FALSE;
break;
}
/* We should have received the segment by then and there should be none left */
- fail_if (collect->expected_segments != NULL);
+ fail_if (collect->expected_segments != NULL,
+ "Didn't receive segment corresponding to seek");
while (seeks) {
SeekInfo *sinfo = (SeekInfo *) seeks->data;