[farsight2/master] Disable upnp in normal tests

[Olivier Crête]

---
 tests/check/transmitter/rawudp.c |   46 +++++++++++++++++++++++++++++--------
 1 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/tests/check/transmitter/rawudp.c b/tests/check/transmitter/rawudp.c
index afe21a7..184628a 100644
--- a/tests/check/transmitter/rawudp.c
+++ b/tests/check/transmitter/rawudp.c
@@ -386,19 +386,33 @@ run_rawudp_transmitter_test (gint n_parameters, GParameter *params,
 
 GST_START_TEST (test_rawudptransmitter_run_nostun)
 {
-  run_rawudp_transmitter_test (0, NULL, 0);
+  GParameter params[1];
+
+  memset (params, 0, sizeof (GParameter));
+
+  params[0].name = "upnp-discovery";
+  g_value_init (&params[0].value, G_TYPE_BOOLEAN);
+  g_value_set_boolean (&params[0].value, FALSE);
+
+  run_rawudp_transmitter_test (1, params, 0);
 }
 GST_END_TEST;
 
 GST_START_TEST (test_rawudptransmitter_run_nostun_nosource)
 {
-  GParameter param = {NULL, {0}};
+  GParameter params[2];
+
+  memset (params, 0, sizeof (GParameter) * 2);
+
+  params[0].name = "associate-on-source";
+  g_value_init (&params[0].value, G_TYPE_BOOLEAN);
+  g_value_set_boolean (&params[0].value, FALSE);
 
-  param.name = "associate-on-source";
-  g_value_init (&param.value, G_TYPE_BOOLEAN);
-  g_value_set_boolean (&param.value, FALSE);
+  params[1].name = "upnp-discovery";
+  g_value_init (&params[1].value, G_TYPE_BOOLEAN);
+  g_value_set_boolean (&params[1].value, FALSE);
 
-  run_rawudp_transmitter_test (1, &param, FLAG_NO_SOURCE);
+  run_rawudp_transmitter_test (2, params, FLAG_NO_SOURCE);
 }
 GST_END_TEST;
 
@@ -476,11 +490,11 @@ GST_END_TEST;
 
 GST_START_TEST (test_rawudptransmitter_run_local_candidates)
 {
-  GParameter params[1];
+  GParameter params[2];
   GList *list = NULL;
   FsCandidate *candidate;
 
-  memset (params, 0, sizeof (GParameter) * 1);
+  memset (params, 0, sizeof (GParameter) * 2);
 
   candidate = fs_candidate_new ("L1",
       FS_COMPONENT_RTP, FS_CANDIDATE_TYPE_HOST,
@@ -496,7 +510,12 @@ GST_START_TEST (test_rawudptransmitter_run_local_candidates)
   g_value_init (&params[0].value, FS_TYPE_CANDIDATE_LIST);
   g_value_set_boxed (&params[0].value, list);
 
-  run_rawudp_transmitter_test (1, params, FLAG_IS_LOCAL);
+  params[1].name = "upnp-discovery";
+  g_value_init (&params[1].value, G_TYPE_BOOLEAN);
+  g_value_set_boolean (&params[1].value, FALSE);
+
+
+  run_rawudp_transmitter_test (2, params, FLAG_IS_LOCAL);
 
   g_value_reset (&params[0].value);
 
@@ -553,6 +572,13 @@ GST_START_TEST (test_rawudptransmitter_stop_stream)
   FsTransmitter *trans;
   FsStreamTransmitter *st;
   GstBus *bus = NULL;
+  GParameter params[1];
+
+  memset (params, 0, sizeof (GParameter));
+
+  params[0].name = "upnp-discovery";
+  g_value_init (&params[0].value, G_TYPE_BOOLEAN);
+  g_value_set_boolean (&params[0].value, FALSE);
 
   has_stun = FALSE;
 
@@ -568,7 +594,7 @@ GST_START_TEST (test_rawudptransmitter_stop_stream)
 
   pipeline = setup_pipeline (trans, G_CALLBACK (_handoff_handler_empty));
 
-  st = fs_transmitter_new_stream_transmitter (trans, NULL, 0, NULL, &error);
+  st = fs_transmitter_new_stream_transmitter (trans, NULL, 1, params, &error);
 
   if (error)
     ts_fail ("Error creating stream transmitter: (%s:%d) %s",
-- 
1.5.6.5