- verboser log, faster start

[oweals/gnunet.git] / src / testbed / test_testbed_api_2peers_1controller.c

diff --git a/src/testbed/test_testbed_api_2peers_1controller.c b/src/testbed/test_testbed_api_2peers_1controller.c
index 86a78acbaf24ce216afcd411a77024eee8b427cd..3b033cfac7f1403e2f5a6919e7864b3220a4aed9 100644 (file)
--- a/src/testbed/test_testbed_api_2peers_1controller.c
+++ b/src/testbed/test_testbed_api_2peers_1controller.c
@@ -27,7 +27,7 @@
 
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 #include "gnunet_testbed_service.h"
 
 
@@ -166,6 +166,7 @@ enum Stage
  */
 static enum Stage result;
 
+
 /**
  * shortcut to exit during failure
  */
@@ -176,10 +177,11 @@ static enum Stage result;
         GNUNET_SCHEDULER_cancel (abort_task);                   \
       abort_task = GNUNET_SCHEDULER_NO_TASK;                    \
       GNUNET_SCHEDULER_add_now (do_shutdown, NULL);             \
-      exit (1);                                                 \
-    }                                                           \
+      return;                                                   \
+    }                                                          \
   } while (0)
 
+
 /**
  * Shutdown nicely
  *
@@ -227,7 +229,7 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @param emsg error message in case the operation has failed; will be NULL if
  *          operation has executed successfully.
  */
-static void 
+static void
 op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg);
 
 
@@ -242,8 +244,9 @@ do_delayed_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   delayed_connect_task = GNUNET_SCHEDULER_NO_TASK;
   FAIL_TEST (NULL == common_operation);
-  common_operation = GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, 
-                                                    peer1.peer, peer2.peer);
+  common_operation =
+      GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, peer1.peer,
+                                      peer2.peer);
 }
 
 
@@ -255,34 +258,21 @@ do_delayed_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @param emsg error message in case the operation has failed; will be NULL if
  *          operation has executed successfully.
  */
-static void 
+static void
 op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg)
 {
   FAIL_TEST (common_operation == op);
-  switch(result)
+  switch (result)
   {
   case PEERS_STARTED:
     FAIL_TEST (NULL == peer1.operation);
     FAIL_TEST (NULL == peer2.operation);
     FAIL_TEST (NULL != common_operation);
-    GNUNET_TESTBED_operation_done (common_operation);
-    common_operation = NULL;
-    result = PEERS_CONNECTED;
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Peers connected\n");
-    delayed_connect_task =
-       GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (3),
-                                     &do_delayed_connect, NULL);
     break;
   case PEERS_CONNECTED:
     FAIL_TEST (NULL == peer1.operation);
     FAIL_TEST (NULL == peer2.operation);
     FAIL_TEST (NULL != common_operation);
-    GNUNET_TESTBED_operation_done (common_operation);
-    common_operation = NULL;
-    result = PEERS_CONNECTED_2;
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Peers connected again\n");
-    peer1.operation = GNUNET_TESTBED_peer_stop (peer1.peer, NULL, NULL);
-    peer2.operation = GNUNET_TESTBED_peer_stop (peer2.peer, NULL, NULL);
     break;
   default:
     FAIL_TEST (0);
@@ -349,7 +339,7 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
       result = PEERS_STARTED;
       common_operation =
           GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, peer1.peer,
-                                         peer2.peer);
+                                          peer2.peer);
     }
     break;
   case GNUNET_TESTBED_ET_PEER_STOP:
@@ -375,12 +365,29 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     switch (result)
     {
     case PEERS_STARTED:
-    case PEERS_CONNECTED:
       FAIL_TEST (NULL == peer1.operation);
       FAIL_TEST (NULL == peer2.operation);
       FAIL_TEST (NULL != common_operation);
       FAIL_TEST ((event->details.peer_connect.peer1 == peer1.peer) &&
-                    (event->details.peer_connect.peer2 == peer2.peer));
+                 (event->details.peer_connect.peer2 == peer2.peer));
+      GNUNET_TESTBED_operation_done (common_operation);
+      common_operation = NULL;
+      result = PEERS_CONNECTED;
+      LOG (GNUNET_ERROR_TYPE_DEBUG, "Peers connected\n");
+      delayed_connect_task =
+          GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (3), &do_delayed_connect,
+                                        NULL);
+      break;
+    case PEERS_CONNECTED:
+      FAIL_TEST (NULL == peer1.operation);
+      FAIL_TEST (NULL == peer2.operation);
+      FAIL_TEST (NULL != common_operation);
+      GNUNET_TESTBED_operation_done (common_operation);
+      common_operation = NULL;
+      result = PEERS_CONNECTED_2;
+      LOG (GNUNET_ERROR_TYPE_DEBUG, "Peers connected again\n");
+      peer1.operation = GNUNET_TESTBED_peer_stop (peer1.peer, NULL, NULL);
+      peer2.operation = GNUNET_TESTBED_peer_stop (peer2.peer, NULL, NULL);
       break;
     default:
       FAIL_TEST (0);
@@ -451,7 +458,11 @@ status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, int status)
 {
   uint64_t event_mask;
 
-  FAIL_TEST (GNUNET_OK == status);
+  if (GNUNET_OK != status)
+  {
+    cp = NULL;
+    FAIL_TEST (0);
+  }
   event_mask = 0;
   event_mask |= (1L << GNUNET_TESTBED_ET_PEER_START);
   event_mask |= (1L << GNUNET_TESTBED_ET_PEER_STOP);