-indentation

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

diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c
index 030b65117eb4c6733455383a7e46673fc5126217..471ab3a94c3ec0d1dd63b49d2f056e9ff4b00eb6 100644 (file)
--- a/src/testbed/test_testbed_api_controllerlink.c
+++ b/src/testbed/test_testbed_api_controllerlink.c
@@ -181,7 +181,12 @@ enum Stage
   SLAVE3_LINK_SUCCESS,
 
   /**
-   * Destory master peer and mark test as success
+   * Master peer destoryed.  Destory slave 3 peer
+   */
+  MASTER_PEER_DESTROY_SUCCESS,
+
+  /**
+   * Slave 3 peer destroyed.  Mark test as success
    */
   SUCCESS,
 
@@ -525,8 +530,7 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     FAIL_TEST (event->details.peer_start.peer == slave1_peer);
     GNUNET_TESTBED_operation_done (op);
     result = SLAVE1_PEER_START_SUCCESS;
-    op = GNUNET_TESTBED_controller_link (NULL, mc, slave2, slave, cfg,
-                                         GNUNET_YES);
+    op = GNUNET_TESTBED_controller_link (NULL, mc, slave2, slave, GNUNET_YES);
     break;
   case SLAVE2_PEER_CREATE_SUCCESS:
     FAIL_TEST (GNUNET_TESTBED_ET_PEER_STOP == event->type);
@@ -542,6 +546,8 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     FAIL_TEST (event->details.peer_start.peer == slave3_peer);
     GNUNET_TESTBED_operation_done (op);
     result = SLAVE3_PEER_START_SUCCESS;
+    sleep (1);
+    LOG_DEBUG ("**************************************\n");
     op = GNUNET_TESTBED_overlay_connect (mc, NULL, NULL, slave2_peer,
                                          slave3_peer);
     FAIL_TEST (NULL != op);
@@ -613,8 +619,7 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     cfg3 = GNUNET_CONFIGURATION_dup (event->details.operation_finished.generic);
     GNUNET_TESTBED_operation_done (op);
     result = SLAVE3_GET_CONFIG_SUCCESS;
-    op = GNUNET_TESTBED_controller_link (NULL, mc, slave3, slave, cfg3,
-                                         GNUNET_NO);
+    op = GNUNET_TESTBED_controller_link (NULL, mc, slave3, slave, GNUNET_NO);
     break;
   case SLAVE3_REGISTERED:
     check_operation_success (event);
@@ -631,6 +636,11 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     break;
   case SLAVE3_LINK_SUCCESS:
     check_operation_success (event);
+    result = MASTER_PEER_DESTROY_SUCCESS;
+    GNUNET_TESTBED_operation_done (op);
+    op = GNUNET_TESTBED_peer_destroy (slave3_peer);
+    break;
+  case MASTER_PEER_DESTROY_SUCCESS:
     result = SUCCESS;
     GNUNET_TESTBED_operation_done (op);
     op = NULL;
@@ -670,8 +680,7 @@ registration_cont (void *cls, const char *emsg)
     FAIL_TEST (NULL != mc);
     result = SLAVE2_REGISTERED;
     FAIL_TEST (NULL != cfg);
-    op = GNUNET_TESTBED_controller_link (NULL, mc, slave, NULL, cfg,
-                                         GNUNET_YES);
+    op = GNUNET_TESTBED_controller_link (NULL, mc, slave, NULL, GNUNET_YES);
     FAIL_TEST (NULL != op);
     break;
   case MASTER_SLAVE2_PEERS_CONNECTED:
@@ -679,8 +688,7 @@ registration_cont (void *cls, const char *emsg)
     FAIL_TEST (NULL != mc);
     FAIL_TEST (NULL == op);
     result = SLAVE3_REGISTERED;
-    op = GNUNET_TESTBED_controller_link (NULL, mc, slave3, NULL, cfg,
-                                         GNUNET_YES);
+    op = GNUNET_TESTBED_controller_link (NULL, mc, slave3, NULL, GNUNET_YES);
     FAIL_TEST (NULL != op);
     break;
   default: