[farsight2/master] tests: Refrain from using the thread unsafe version of failure in the nice test
Olivier Crête
olivier.crete at collabora.co.uk
Thu Sep 3 14:55:57 PDT 2009
---
tests/check/transmitter/generic.c | 4 ++--
tests/check/transmitter/nice.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/check/transmitter/generic.c b/tests/check/transmitter/generic.c
index 715953e..920efed 100644
--- a/tests/check/transmitter/generic.c
+++ b/tests/check/transmitter/generic.c
@@ -196,8 +196,8 @@ test_transmitter_creation (gchar *transmitter_name)
g_object_get (trans, "gst-sink", &trans_sink, "gst-src", &trans_src, NULL);
- fail_if (trans_sink == NULL, "Sink is NULL");
- fail_if (trans_src == NULL, "Src is NULL");
+ ts_fail_if (trans_sink == NULL, "Sink is NULL");
+ ts_fail_if (trans_src == NULL, "Src is NULL");
gst_object_unref (trans_sink);
gst_object_unref (trans_src);
diff --git a/tests/check/transmitter/nice.c b/tests/check/transmitter/nice.c
index bd063fb..cb931c4 100644
--- a/tests/check/transmitter/nice.c
+++ b/tests/check/transmitter/nice.c
@@ -304,7 +304,7 @@ _stream_state_changed (FsStreamTransmitter *st, guint component,
oldstate = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (st), prop));
- fail_if (state < FS_STREAM_STATE_CONNECTED && state < oldstate,
+ ts_fail_if (state < FS_STREAM_STATE_CONNECTED && state < oldstate,
"State went in wrong direction %d -> %d for component %u",
oldstate, state, component);
@@ -386,7 +386,7 @@ run_nice_transmitter_test (gint n_parameters, GParameter *params,
force_candidates = (flags & FLAG_FORCE_CANDIDATES);
if (flags & FLAG_RECVONLY_FILTER)
- fail_unless (fs_fake_filter_register ());
+ ts_fail_unless (fs_fake_filter_register ());
if (flags & FLAG_NOT_SENDING)
{
--
1.5.6.5
More information about the farsight-commits
mailing list