[GNUnet-SVN] r33349 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2014-05-20 18:13:07 +0200 (Tue, 20 May 2014)
New Revision: 33349

Modified:
   gnunet/src/transport/test_transport_address_switch.c
Log:
improved test


Modified: gnunet/src/transport/test_transport_address_switch.c
===================================================================
--- gnunet/src/transport/test_transport_address_switch.c        2014-05-20 
16:10:27 UTC (rev 33348)
+++ gnunet/src/transport/test_transport_address_switch.c        2014-05-20 
16:13:07 UTC (rev 33349)
@@ -591,6 +591,19 @@
 
   p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1,
       &notify_receive, &notify_connect, &notify_disconnect, &start_cb, NULL );
+
+  p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2,
+      &notify_receive, &notify_connect, &notify_disconnect, &start_cb, NULL );
+
+  if ((p1 == NULL )|| (p2 == NULL))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
+    if (die_task != GNUNET_SCHEDULER_NO_TASK)
+    GNUNET_SCHEDULER_cancel (die_task);
+    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+    return;
+  }
+
   p1_stat = GNUNET_STATISTICS_create ("transport", p1->cfg);
   GNUNET_STATISTICS_watch (p1_stat, "transport",
       "# Attempts to switch addresses",
@@ -611,9 +624,6 @@
       "# transport addresses",
       stat_addresses_available, p1);
 
-  p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2,
-      &notify_receive, &notify_connect, &notify_disconnect, &start_cb, NULL );
-
   p2_stat = GNUNET_STATISTICS_create ("transport", p2->cfg);
   GNUNET_STATISTICS_watch (p2_stat, "transport",
       "# Attempts to switch addresses",
@@ -634,15 +644,6 @@
       "# transport addresses",
       stat_addresses_available, p2);
 
-  if ((p1 == NULL )|| (p2 == NULL))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not start peers!\n");
-    if (die_task != GNUNET_SCHEDULER_NO_TASK)
-    GNUNET_SCHEDULER_cancel (die_task);
-    die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
-    return;
-  }
-
   if ((p1_stat == NULL )|| (p2_stat == NULL))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Fail! Could not create statistics 
for peers!\n");