From ddf82b5695bcc96f68b9d13299760cb083fa608c Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Sun, 7 May 2006 17:25:56 +0000 Subject: [PATCH] tests/check/elements/adder.c: Shuffle NULL state change around and raise timeout more Original commit message from CVS: * tests/check/elements/adder.c: (event_loop), (GST_START_TEST), (adder_suite): Shuffle NULL state change around and raise timeout more --- ChangeLog | 6 ++++++ tests/check/elements/adder.c | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78e4a26ba6..dfa0844e62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-05-07 Stefan Kost + + * tests/check/elements/adder.c: (event_loop), (GST_START_TEST), + (adder_suite): + Shuffle NULL state change around and raise timeout more + 2006-05-07 Stefan Kost * gst/typefind/gsttypefindfunctions.c: (mp4_find_box), diff --git a/tests/check/elements/adder.c b/tests/check/elements/adder.c index dd5e7f88f7..6b158302dd 100644 --- a/tests/check/elements/adder.c +++ b/tests/check/elements/adder.c @@ -55,7 +55,6 @@ event_loop (GstElement * bin) case GST_MESSAGE_SEGMENT_DONE: gst_message_parse_segment_done (message, &format, &position); GST_INFO ("received segment_done : %" G_GINT64_FORMAT, position); - gst_element_set_state (bin, GST_STATE_NULL); loop = FALSE; break; case GST_MESSAGE_WARNING: @@ -118,6 +117,9 @@ GST_START_TEST (test_event) event_loop (bin); + res = gst_element_set_state (bin, GST_STATE_NULL); + fail_unless (res != GST_STATE_CHANGE_FAILURE, NULL); + fail_unless (position == GST_SECOND, NULL); /* cleanup */ @@ -135,9 +137,8 @@ adder_suite (void) suite_add_tcase (s, tc_chain); tcase_add_test (tc_chain, test_event); - /* Use a long timeout, as we test all elements and take - * at least 0.2 seconds each */ - tcase_set_timeout (tc_chain, 5); + /* Use a longer timeout */ + tcase_set_timeout (tc_chain, 10); return s; }