From: <sl...@ke...> - 2008-04-10 07:11:59
|
CVS Root: /cvs/gstreamer Module: gst-plugins-bad Changes by: slomo Date: Thu Apr 10 2008 07:12:05 UTC Log message: * tests/check/elements/souphttpsrc.c: (got_buffer), (souphttpsrc_suite): Increase the timeout for the internet tests to 250 seconds and check for NULL caps instead of just crashing. The real fix would be to implement an shoutcast server for the unit test instead of relying on a working internet connection. Fixes bug #521749. Modified files: . : ChangeLog tests/check/elements: souphttpsrc.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3249&r2=1.3250 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/tests/check/elements/souphttpsrc.c.diff?r1=1.4&r2=1.5 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v retrieving revision 1.3249 retrieving revision 1.3250 diff -u -d -r1.3249 -r1.3250 --- ChangeLog 9 Apr 2008 22:27:49 -0000 1.3249 +++ ChangeLog 10 Apr 2008 07:11:50 -0000 1.3250 @@ -1,3 +1,13 @@ +2008-04-10 Sebastian Dröge <sl...@ci...> + + * tests/check/elements/souphttpsrc.c: (got_buffer), + (souphttpsrc_suite): + Increase the timeout for the internet tests to 250 seconds + and check for NULL caps instead of just crashing. + The real fix would be to implement an shoutcast server for the unit test + instead of relying on a working internet connection. + Fixes bug #521749. 2008-04-10 Peter Kjellerstedt <pk...@ax...> * gst/rtpmanager/gstrtpbin.c: (free_session): Index: souphttpsrc.c RCS file: /cvs/gstreamer/gst-plugins-bad/tests/check/elements/souphttpsrc.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- souphttpsrc.c 22 Mar 2008 19:26:04 -0000 1.4 +++ souphttpsrc.c 10 Apr 2008 07:11:51 -0000 1.5 @@ -214,8 +214,9 @@ return; /* Otherwise they _must_ be "application/x-icy" */ + fail_unless (GST_BUFFER_CAPS (buf) != NULL); s = gst_caps_get_structure (GST_BUFFER_CAPS (buf), 0); - assert_equals_string (gst_structure_get_name (s), "application/x-icy"); + fail_unless_equals_string (gst_structure_get_name (s), "application/x-icy"); } GST_START_TEST (test_icy_stream) @@ -305,6 +306,7 @@ Suite *s = suite_create ("souphttpsrc"); TCase *tc_chain = tcase_create ("general"); + TCase *tc_internet = tcase_create ("internet"); suite_add_tcase (s, tc_chain); run_server (&http_port, &https_port); @@ -315,7 +317,10 @@ tcase_add_test (tc_chain, test_not_found); tcase_add_test (tc_chain, test_forbidden); tcase_add_test (tc_chain, test_cookies); - tcase_add_test (tc_chain, test_icy_stream); + suite_add_tcase (s, tc_internet); + tcase_set_timeout (tc_internet, 250); + tcase_add_test (tc_internet, test_icy_stream); return s; |