From 2efaf65c4cf7dd6b1524d5e6f1193b15bc47104e Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 21 Apr 2009 15:25:12 +0200 Subject: [PATCH] tests: fix unit-tests for new stream-status Fix the unit-tests so that they don't fail on the new stream-status messages that are emited now. --- tests/check/gst/gstbin.c | 10 ++++++---- tests/check/pipelines/cleanup.c | 2 +- tests/check/pipelines/simple-launch-lines.c | 11 ++++++----- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c index 26558fba16..1d2c44efc6 100644 --- a/tests/check/gst/gstbin.c +++ b/tests/check/gst/gstbin.c @@ -300,8 +300,9 @@ GST_START_TEST (test_message_state_changed_children) /* each object is referenced by a message; * base_src is blocked in the push and has an extra refcount. * base_sink_chain has taken a refcount on the sink, and is blocked on - * preroll */ - ASSERT_OBJECT_REFCOUNT (src, "src", 2); + * preroll + * The stream-status message holds another ref to the element */ + ASSERT_OBJECT_REFCOUNT (src, "src", 3); /* refcount can be 4 if the bin is still processing the async_done message of * the sink. */ ASSERT_OBJECT_REFCOUNT_BETWEEN (sink, "sink", 2, 3); @@ -352,8 +353,9 @@ GST_START_TEST (test_message_state_changed_children) ret = gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_READY); fail_unless (ret == GST_STATE_CHANGE_SUCCESS); - /* each object is referenced by two messages */ - ASSERT_OBJECT_REFCOUNT (src, "src", 3); + /* each object is referenced by two messages, the source also has the + * stream-status message referencing it */ + ASSERT_OBJECT_REFCOUNT (src, "src", 4); ASSERT_OBJECT_REFCOUNT (sink, "sink", 3); ASSERT_OBJECT_REFCOUNT (pipeline, "pipeline", 3); diff --git a/tests/check/pipelines/cleanup.c b/tests/check/pipelines/cleanup.c index 1446888e39..473addee5f 100644 --- a/tests/check/pipelines/cleanup.c +++ b/tests/check/pipelines/cleanup.c @@ -91,7 +91,7 @@ GST_START_TEST (test_pipeline_unref) run_pipeline (pipeline, s, GST_MESSAGE_NEW_CLOCK | GST_MESSAGE_STATE_CHANGED | - GST_MESSAGE_ASYNC_DONE, GST_MESSAGE_EOS); + GST_MESSAGE_STREAM_STATUS | GST_MESSAGE_ASYNC_DONE, GST_MESSAGE_EOS); while (GST_OBJECT_REFCOUNT_VALUE (src) > 1) THREAD_SWITCH (); ASSERT_OBJECT_REFCOUNT (src, "src", 1); diff --git a/tests/check/pipelines/simple-launch-lines.c b/tests/check/pipelines/simple-launch-lines.c index 167e049d3b..8575ad8888 100644 --- a/tests/check/pipelines/simple-launch-lines.c +++ b/tests/check/pipelines/simple-launch-lines.c @@ -102,27 +102,28 @@ GST_START_TEST (test_2_elements) s = "fakesrc can-activate-push=false ! fakesink can-activate-pull=true"; run_pipeline (setup_pipeline (s), s, GST_MESSAGE_NEW_CLOCK | GST_MESSAGE_STATE_CHANGED | - GST_MESSAGE_ASYNC_DONE, GST_MESSAGE_UNKNOWN); + GST_MESSAGE_STREAM_STATUS | GST_MESSAGE_ASYNC_DONE, GST_MESSAGE_UNKNOWN); s = "fakesrc can-activate-push=true ! fakesink can-activate-pull=false"; run_pipeline (setup_pipeline (s), s, GST_MESSAGE_NEW_CLOCK | GST_MESSAGE_STATE_CHANGED | - GST_MESSAGE_ASYNC_DONE, GST_MESSAGE_UNKNOWN); + GST_MESSAGE_STREAM_STATUS | GST_MESSAGE_ASYNC_DONE, GST_MESSAGE_UNKNOWN); s = "fakesrc can-activate-push=false num-buffers=10 ! fakesink can-activate-pull=true"; run_pipeline (setup_pipeline (s), s, GST_MESSAGE_NEW_CLOCK | GST_MESSAGE_STATE_CHANGED | - GST_MESSAGE_ASYNC_DONE, GST_MESSAGE_EOS); + GST_MESSAGE_STREAM_STATUS | GST_MESSAGE_ASYNC_DONE, GST_MESSAGE_EOS); s = "fakesrc can-activate-push=true num-buffers=10 ! fakesink can-activate-pull=false"; run_pipeline (setup_pipeline (s), s, GST_MESSAGE_NEW_CLOCK | GST_MESSAGE_STATE_CHANGED | - GST_MESSAGE_ASYNC_DONE, GST_MESSAGE_EOS); + GST_MESSAGE_STREAM_STATUS | GST_MESSAGE_ASYNC_DONE, GST_MESSAGE_EOS); s = "fakesrc can-activate-push=false ! fakesink can-activate-pull=false"; ASSERT_CRITICAL (run_pipeline (setup_pipeline (s), s, GST_MESSAGE_NEW_CLOCK | GST_MESSAGE_STATE_CHANGED | - GST_MESSAGE_ASYNC_DONE, GST_MESSAGE_UNKNOWN)); + GST_MESSAGE_STREAM_STATUS | GST_MESSAGE_ASYNC_DONE, + GST_MESSAGE_UNKNOWN)); } GST_END_TEST;