[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r23340 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r23340 - gnunet/src/testbed |
Date: |
Tue, 21 Aug 2012 14:12:25 +0200 |
Author: harsha
Date: 2012-08-21 14:12:25 +0200 (Tue, 21 Aug 2012)
New Revision: 23340
Modified:
gnunet/src/testbed/Makefile.am
gnunet/src/testbed/test_testbed_api_controllerlink.c
Log:
removed controller link testcase from default tests
Modified: gnunet/src/testbed/Makefile.am
===================================================================
--- gnunet/src/testbed/Makefile.am 2012-08-21 11:59:57 UTC (rev 23339)
+++ gnunet/src/testbed/Makefile.am 2012-08-21 12:12:25 UTC (rev 23340)
@@ -81,8 +81,7 @@
test_testbed_api_hosts \
test_testbed_api_2peers \
test_testbed_api_operations \
- test_gnunet_testbed_helper \
- test_testbed_api_controllerlink
+ test_gnunet_testbed_helper
endif
test_testbed_api_hosts_SOURCES = \
Modified: gnunet/src/testbed/test_testbed_api_controllerlink.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_controllerlink.c 2012-08-21
11:59:57 UTC (rev 23339)
+++ gnunet/src/testbed/test_testbed_api_controllerlink.c 2012-08-21
12:12:25 UTC (rev 23340)
@@ -63,8 +63,18 @@
SLAVE1_REGISTERED,
/**
- * Final stage
+ * The second slave has been registered at the master controller
*/
+ SLAVE2_REGISTERED,
+
+ /**
+ * Link from master to slave 1 has been successfully created
+ */
+ SLAVE1_LINK_SUCCESS,
+
+ /**
+ * Link from slave 1 to slave 2 has been successfully created.
+ */
SUCCESS
};
@@ -90,6 +100,11 @@
static struct GNUNET_TESTBED_Host *slave;
/**
+ * Another slave host for running another slave controller
+ */
+static struct GNUNET_TESTBED_Host *slave2;
+
+/**
* Slave host registration handle
*/
static struct GNUNET_TESTBED_HostRegistrationHandle *rh;
@@ -131,6 +146,8 @@
{
if (GNUNET_SCHEDULER_NO_TASK != abort_task)
GNUNET_SCHEDULER_cancel (abort_task);
+ if (NULL != slave2)
+ GNUNET_TESTBED_host_destroy (slave2);
if (NULL != slave)
GNUNET_TESTBED_host_destroy (slave);
if (NULL != host)
@@ -174,7 +191,7 @@
{
switch (result)
{
- case SLAVE1_REGISTERED:
+ case SLAVE2_REGISTERED:
GNUNET_assert (NULL != event);
GNUNET_assert (GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type);
GNUNET_assert (event->details.operation_finished.operation == op);
@@ -185,6 +202,22 @@
GNUNET_assert (NULL ==
event->details.operation_finished.op_result.generic);
GNUNET_TESTBED_operation_done (op);
op = NULL;
+ result = SLAVE1_LINK_SUCCESS;
+ GNUNET_assert (NULL != slave2);
+ GNUNET_assert (NULL != slave);
+ op = GNUNET_TESTBED_controller_link (mc, slave2, slave, cfg, GNUNET_YES);
+ GNUNET_assert (NULL != op);
+ break;
+ case SLAVE1_LINK_SUCCESS:
+ GNUNET_assert (GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type);
+ GNUNET_assert (event->details.operation_finished.operation == op);
+ GNUNET_assert (NULL == event->details.operation_finished.op_cls);
+ GNUNET_assert (NULL == event->details.operation_finished.emsg);
+ GNUNET_assert (GNUNET_TESTBED_PIT_GENERIC ==
+ event->details.operation_finished.pit);
+ GNUNET_assert (NULL ==
event->details.operation_finished.op_result.generic);
+ GNUNET_TESTBED_operation_done (op);
+ op = NULL;
result = SUCCESS;
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
break;
@@ -210,13 +243,23 @@
GNUNET_assert (NULL == emsg);
GNUNET_assert (NULL != mc);
result = SLAVE1_REGISTERED;
+ slave2 = GNUNET_TESTBED_host_create_with_id (2, "127.0.0.1", NULL, 0);
+ GNUNET_assert (NULL != slave2);
+ rh = GNUNET_TESTBED_register_host (mc, slave2, ®istration_cont, NULL);
+ GNUNET_assert (NULL != rh);
+ break;
+ case SLAVE1_REGISTERED:
+ GNUNET_assert (NULL == emsg);
+ GNUNET_assert (NULL != mc);
+ result = SLAVE2_REGISTERED;
GNUNET_assert (NULL != cfg);
op = GNUNET_TESTBED_controller_link (mc, slave, NULL, cfg, GNUNET_YES);
GNUNET_assert (NULL != op);
break;
case INIT:
case SUCCESS:
- case SLAVE1_REGISTERED:
+ case SLAVE2_REGISTERED:
+ case SLAVE1_LINK_SUCCESS:
GNUNET_assert (0);
}
}
@@ -247,7 +290,7 @@
&controller_cb, NULL);
GNUNET_assert (NULL != mc);
result = MASTER_STARTED;
- slave = GNUNET_TESTBED_host_create_with_id (2, "127.0.0.1", NULL, 0);
+ slave = GNUNET_TESTBED_host_create_with_id (1, "127.0.0.1", NULL, 0);
GNUNET_assert (NULL != slave);
rh = GNUNET_TESTBED_register_host (mc, slave, ®istration_cont, NULL);
GNUNET_assert (NULL != rh);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r23340 - gnunet/src/testbed,
gnunet <=