- showcase failing controllerlink case

1 files changed, 85 insertions, 32 deletions

diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c
index b3e13f1ff..030b65117 100644
--- a/src/testbed/test_testbed_api_controllerlink.c
+++ b/src/testbed/test_testbed_api_controllerlink.c
@@ -131,29 +131,44 @@ enum Stage
   MASTER_SLAVE2_PEERS_CONNECTED,
 
   /**
-   * Peer on slave 2 successfully stopped
+   * Slave 3 has successfully registered
    */
-  SLAVE2_PEER_STOP_SUCCESS,
+  SLAVE3_REGISTERED,
 
   /**
-   * Peer destroy on slave 1 successful
+   * Slave 3 has successfully started
    */
-  SLAVE1_PEER_DESTROY_SUCCESS,
+  SLAVE3_STARTED,
 
   /**
-   * Peer destory on slave 2 successful
+   * Peer created on slave 3
    */
-  SLAVE2_PEER_DESTROY_SUCCESS,
+  SLAVE3_PEER_CREATE_SUCCESS,
 
   /**
-   * Slave 3 has successfully registered
+   * Peer started at slave 3
    */
-  SLAVE3_REGISTERED,
+  SLAVE3_PEER_START_SUCCESS,
 
   /**
-   * Slave 3 has successfully started
+   * Try to connect peers on slave2 and slave3
    */
-  SLAVE3_STARTED,
+  SLAVE2_SLAVE3_PEERS_CONNECTED,
+
+  /**
+   * Peer on slave 2 successfully stopped
+   */
+  SLAVE2_PEER_STOP_SUCCESS,
+
+  /**
+   * Peer destroy on slave 1 successful
+   */
+  SLAVE1_PEER_DESTROY_SUCCESS,
+
+  /**
+   * Peer destory on slave 2 successful
+   */
+  SLAVE2_PEER_DESTROY_SUCCESS,
 
   /**
    * The configuration of slave 3 is acquired
@@ -242,6 +257,11 @@ static struct GNUNET_TESTBED_Peer *slave1_peer;
 static struct GNUNET_TESTBED_Peer *slave2_peer;
 
 /**
+ * Handle to peer started at slave 2
+ */
+static struct GNUNET_TESTBED_Peer *slave3_peer;
+
+/**
  * Handle to a peer started at master controller
  */
 static struct GNUNET_TESTBED_Peer *master_peer;
@@ -351,6 +371,16 @@ do_abort_now (void *cls)
 
 
 /**
+ * Callback which will be called to after a host registration succeeded or failed
+ *
+ * @param cls the host which has been registered
+ * @param emsg the error message; NULL if host registration is successful
+ */
+static void
+registration_cont (void *cls, const char *emsg);
+
+
+/**
  * Task for inserting delay between tests
  *
  * @param
@@ -367,6 +397,10 @@ delay_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     FAIL_TEST (NULL != op);
     break;
   case MASTER_SLAVE2_PEERS_CONNECTED:
+    slave3 = GNUNET_TESTBED_host_create_with_id (3, "127.0.0.1", NULL, cfg, 0);
+    rh = GNUNET_TESTBED_register_host (mc, slave3, &registration_cont, NULL);
+    break;
+  case SLAVE2_SLAVE3_PEERS_CONNECTED:
     op = GNUNET_TESTBED_peer_stop (NULL, slave2_peer, NULL, NULL);
     FAIL_TEST (NULL != op);
     break;
@@ -414,6 +448,12 @@ peer_create_cb (void *cls, struct GNUNET_TESTBED_Peer *peer, const char *emsg)
                                       &delay_task,
                                       NULL);
     break;
+  case SLAVE3_STARTED:
+    result = SLAVE3_PEER_CREATE_SUCCESS;
+    slave3_peer = peer;
+    GNUNET_TESTBED_operation_done (op);
+    op = GNUNET_TESTBED_peer_start (NULL, slave3_peer, NULL, NULL);
+    break;
   default:
     FAIL_TEST (0);
   }
@@ -440,16 +480,6 @@ check_operation_success (const struct GNUNET_TESTBED_EventInformation *event)
 
 
 /**
- * Callback which will be called to after a host registration succeeded or failed
- *
- * @param cls the host which has been registered
- * @param emsg the error message; NULL if host registration is successful
- */
-static void
-registration_cont (void *cls, const char *emsg);
-
-
-/**
  * Signature of the event handler function called by the
  * respective event controller.
  *
@@ -506,6 +536,29 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     op = GNUNET_TESTBED_peer_start (NULL, slave2_peer, NULL, NULL);
     FAIL_TEST (NULL != op);
     break;
+  case SLAVE3_PEER_CREATE_SUCCESS:
+    FAIL_TEST (GNUNET_TESTBED_ET_PEER_START == event->type);
+    FAIL_TEST (event->details.peer_start.host == slave3);
+    FAIL_TEST (event->details.peer_start.peer == slave3_peer);
+    GNUNET_TESTBED_operation_done (op);
+    result = SLAVE3_PEER_START_SUCCESS;
+    op = GNUNET_TESTBED_overlay_connect (mc, NULL, NULL, slave2_peer,
+                                         slave3_peer);
+    FAIL_TEST (NULL != op);
+    break;
+  case SLAVE3_PEER_START_SUCCESS:
+    FAIL_TEST (NULL != event);
+    FAIL_TEST (GNUNET_TESTBED_ET_CONNECT == event->type);
+    FAIL_TEST (event->details.peer_connect.peer1 == slave2_peer);
+    FAIL_TEST (event->details.peer_connect.peer2 == slave3_peer);
+    result = SLAVE2_SLAVE3_PEERS_CONNECTED;
+    GNUNET_TESTBED_operation_done (op);
+    op = NULL;
+    delay_task_id =
+        GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                      (GNUNET_TIME_UNIT_SECONDS, 1), &delay_task,
+                                      NULL);
+    break;
   case SLAVE1_PEER_STOP_SUCCESS:
     FAIL_TEST (GNUNET_TESTBED_ET_PEER_START == event->type);
     FAIL_TEST (event->details.peer_start.host == slave2);
@@ -528,7 +581,7 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
                                       (GNUNET_TIME_UNIT_SECONDS, 1), &delay_task,
                                       NULL);
     break;
-  case MASTER_SLAVE2_PEERS_CONNECTED:
+  case SLAVE2_SLAVE3_PEERS_CONNECTED:
     FAIL_TEST (GNUNET_TESTBED_ET_PEER_STOP == event->type);
     FAIL_TEST (event->details.peer_stop.peer == slave2_peer);
     GNUNET_TESTBED_operation_done (op);
@@ -548,18 +601,10 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     GNUNET_TESTBED_operation_done (op);
     op = NULL;
     result = SLAVE2_PEER_DESTROY_SUCCESS;
-    slave3 = GNUNET_TESTBED_host_create_with_id (3, "127.0.0.1", NULL, cfg, 0);
-    rh = GNUNET_TESTBED_register_host (mc, slave3, &registration_cont, NULL);
-    break;
-  case SLAVE3_REGISTERED:
-    check_operation_success (event);
-    GNUNET_TESTBED_operation_done (op);
-    op = NULL;
-    result = SLAVE3_STARTED;
     op = GNUNET_TESTBED_get_slave_config (NULL, mc, slave3);
     FAIL_TEST (NULL != op);
     break;
-  case SLAVE3_STARTED:
+  case SLAVE2_PEER_DESTROY_SUCCESS:
     FAIL_TEST (NULL != event);
     FAIL_TEST (GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type);
     FAIL_TEST (event->op == op);
@@ -571,6 +616,14 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     op = GNUNET_TESTBED_controller_link (NULL, mc, slave3, slave, cfg3,
                                          GNUNET_NO);
     break;
+  case SLAVE3_REGISTERED:
+    check_operation_success (event);
+    GNUNET_TESTBED_operation_done (op);
+    op = NULL;
+    result = SLAVE3_STARTED;
+    op = GNUNET_TESTBED_peer_create (mc, slave3, cfg, peer_create_cb, NULL);
+    FAIL_TEST (NULL != op);
+    break;
   case SLAVE3_GET_CONFIG_SUCCESS:
     result = SLAVE3_LINK_SUCCESS;
     GNUNET_TESTBED_operation_done (op);
@@ -582,7 +635,7 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
     GNUNET_TESTBED_operation_done (op);
     op = NULL;
     GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                  (GNUNET_TIME_UNIT_SECONDS, 3), &do_shutdown,
+                                  (GNUNET_TIME_UNIT_SECONDS, 1), &do_shutdown,
                                   NULL);
     break;
   default:
@@ -621,7 +674,7 @@ registration_cont (void *cls, const char *emsg)
                                          GNUNET_YES);
     FAIL_TEST (NULL != op);
     break;
-  case SLAVE2_PEER_DESTROY_SUCCESS:
+  case MASTER_SLAVE2_PEERS_CONNECTED:
     FAIL_TEST (NULL == emsg);
     FAIL_TEST (NULL != mc);
     FAIL_TEST (NULL == op);