From a7d07e2b7e98dd1b56ddc8b78ce0bbad9d5c9779 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Mon, 10 Oct 2005 11:04:55 +0000 Subject: [PATCH] check/states/sinks.c (test_src_sink): Cleanups from the state change patch. Original commit message from CVS: 2005-10-10 Andy Wingo * check/states/sinks.c (test_src_sink): Cleanups from the state change patch. (test_livesrc_sink): Sync on the state. --- ChangeLog | 4 ++++ check/states/sinks.c | 9 ++++++++- tests/check/generic/sinks.c | 9 ++++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24c0b5f..a859c3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-10-10 Andy Wingo + * check/states/sinks.c (test_src_sink): Cleanups from the state + change patch. + (test_livesrc_sink): Sync on the state. + * check/pipelines/simple_launch_lines.c (run_pipeline): Merge from the state change patch. diff --git a/check/states/sinks.c b/check/states/sinks.c index c9ccd49..af4dffe 100644 --- a/check/states/sinks.c +++ b/check/states/sinks.c @@ -91,6 +91,11 @@ GST_START_TEST (test_src_sink) fail_unless (ret == GST_STATE_CHANGE_SUCCESS, "not playing"); fail_unless (current == GST_STATE_PLAYING, "not playing"); fail_unless (pending == GST_STATE_VOID_PENDING, "not playing"); + ret = gst_element_set_state (pipeline, GST_STATE_NULL); + fail_unless (ret == GST_STATE_CHANGE_SUCCESS, "cannot null pipeline"); + + gst_object_unref (pipeline); + } GST_END_TEST @@ -177,7 +182,9 @@ GST_START_TEST (test_livesrc_sink) fail_unless (pending == GST_STATE_VOID_PENDING, "not playing"); ret = gst_element_set_state (pipeline, GST_STATE_PLAYING); - fail_unless (ret == GST_STATE_CHANGE_SUCCESS, "cannot force play"); + ret = gst_element_get_state (pipeline, NULL, NULL, NULL); + fail_unless (ret == GST_STATE_CHANGE_SUCCESS, "cannot force play got %d", + ret); ret = gst_element_get_state (pipeline, ¤t, &pending, NULL); fail_unless (ret == GST_STATE_CHANGE_SUCCESS, "not playing"); diff --git a/tests/check/generic/sinks.c b/tests/check/generic/sinks.c index c9ccd49..af4dffe 100644 --- a/tests/check/generic/sinks.c +++ b/tests/check/generic/sinks.c @@ -91,6 +91,11 @@ GST_START_TEST (test_src_sink) fail_unless (ret == GST_STATE_CHANGE_SUCCESS, "not playing"); fail_unless (current == GST_STATE_PLAYING, "not playing"); fail_unless (pending == GST_STATE_VOID_PENDING, "not playing"); + ret = gst_element_set_state (pipeline, GST_STATE_NULL); + fail_unless (ret == GST_STATE_CHANGE_SUCCESS, "cannot null pipeline"); + + gst_object_unref (pipeline); + } GST_END_TEST @@ -177,7 +182,9 @@ GST_START_TEST (test_livesrc_sink) fail_unless (pending == GST_STATE_VOID_PENDING, "not playing"); ret = gst_element_set_state (pipeline, GST_STATE_PLAYING); - fail_unless (ret == GST_STATE_CHANGE_SUCCESS, "cannot force play"); + ret = gst_element_get_state (pipeline, NULL, NULL, NULL); + fail_unless (ret == GST_STATE_CHANGE_SUCCESS, "cannot force play got %d", + ret); ret = gst_element_get_state (pipeline, ¤t, &pending, NULL); fail_unless (ret == GST_STATE_CHANGE_SUCCESS, "not playing"); -- 2.7.4