X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftestbed%2Ftest_testbed_api_2peers_1controller.c;h=18bff91e99bc398536b30991866f1b134f1b465e;hb=db9c68c76d7a9eb3f200df9d0fcaf971387cb061;hp=d0638d5642beba788542eeae22fc64b4fcd7e1e4;hpb=c2c1e98f13fe65acba7fb9123abc3dd515c61e78;p=oweals%2Fgnunet.git diff --git a/src/testbed/test_testbed_api_2peers_1controller.c b/src/testbed/test_testbed_api_2peers_1controller.c index d0638d564..18bff91e9 100644 --- a/src/testbed/test_testbed_api_2peers_1controller.c +++ b/src/testbed/test_testbed_api_2peers_1controller.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet - (C) 2008--2012 Christian Grothoff (and other contributing authors) + (C) 2008--2013 Christian Grothoff (and other contributing authors) GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -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" @@ -43,7 +43,6 @@ #define TIME_REL_SECS(sec) \ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, sec) - /** * Peer context */ @@ -168,6 +167,21 @@ enum Stage static enum Stage result; +/** + * shortcut to exit during failure + */ +#define FAIL_TEST(cond) do { \ + if (!(cond)) { \ + GNUNET_break(0); \ + if (GNUNET_SCHEDULER_NO_TASK != abort_task) \ + GNUNET_SCHEDULER_cancel (abort_task); \ + abort_task = GNUNET_SCHEDULER_NO_TASK; \ + GNUNET_SCHEDULER_add_now (do_shutdown, NULL); \ + return; \ + } \ + } while (0) + + /** * Shutdown nicely * @@ -179,7 +193,8 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { if (GNUNET_SCHEDULER_NO_TASK != abort_task) GNUNET_SCHEDULER_cancel (abort_task); - GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == delayed_connect_task); + if (GNUNET_SCHEDULER_NO_TASK != delayed_connect_task) + GNUNET_SCHEDULER_cancel (delayed_connect_task); if (NULL != reg_handle) GNUNET_TESTBED_cancel_registration (reg_handle); GNUNET_TESTBED_controller_disconnect (controller); @@ -202,7 +217,6 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); abort_task = GNUNET_SCHEDULER_NO_TASK; - GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == delayed_connect_task); do_shutdown (cls, tc); } @@ -215,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); @@ -229,9 +243,10 @@ static void do_delayed_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { delayed_connect_task = GNUNET_SCHEDULER_NO_TASK; - GNUNET_assert (NULL == common_operation); - common_operation = GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, - peer1.peer, peer2.peer); + FAIL_TEST (NULL == common_operation); + common_operation = + GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, peer1.peer, + peer2.peer); } @@ -243,37 +258,24 @@ 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) { - GNUNET_assert (common_operation == op); - switch(result) + FAIL_TEST (common_operation == op); + switch (result) { case PEERS_STARTED: - GNUNET_assert (NULL == peer1.operation); - GNUNET_assert (NULL == peer2.operation); - GNUNET_assert (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); + FAIL_TEST (NULL == peer1.operation); + FAIL_TEST (NULL == peer2.operation); + FAIL_TEST (NULL != common_operation); break; case PEERS_CONNECTED: - GNUNET_assert (NULL == peer1.operation); - GNUNET_assert (NULL == peer2.operation); - GNUNET_assert (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); + FAIL_TEST (NULL == peer1.operation); + FAIL_TEST (NULL == peer2.operation); + FAIL_TEST (NULL != common_operation); break; default: - GNUNET_assert (0); + FAIL_TEST (0); } } @@ -291,24 +293,24 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) switch (event->type) { case GNUNET_TESTBED_ET_OPERATION_FINISHED: /* Will be reached when we destroy peers */ - GNUNET_assert (PEERS_STOPPED == result); - GNUNET_assert (NULL == event->details.operation_finished.op_cls); - GNUNET_assert (NULL == event->details.operation_finished.emsg); - GNUNET_assert (NULL == event->details.operation_finished.generic); - if (event->details.operation_finished.operation == peer1.operation) + FAIL_TEST (PEERS_STOPPED == result); + FAIL_TEST (NULL == event->op_cls); + FAIL_TEST (NULL == event->details.operation_finished.emsg); + FAIL_TEST (NULL == event->details.operation_finished.generic); + if (event->op == peer1.operation) { GNUNET_TESTBED_operation_done (peer1.operation); peer1.operation = NULL; peer1.peer = NULL; } - else if (event->details.operation_finished.operation == peer2.operation) + else if (event->op == peer2.operation) { GNUNET_TESTBED_operation_done (peer2.operation); peer2.operation = NULL; peer2.peer = NULL; } else - GNUNET_assert (0); + FAIL_TEST (0); if ((NULL == peer1.peer) && (NULL == peer2.peer)) { result = SUCCESS; @@ -316,8 +318,8 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) } break; case GNUNET_TESTBED_ET_PEER_START: - GNUNET_assert (INIT == result); - GNUNET_assert (event->details.peer_start.host == host); + FAIL_TEST (INIT == result); + FAIL_TEST (event->details.peer_start.host == host); if (event->details.peer_start.peer == peer1.peer) { peer1.is_running = GNUNET_YES; @@ -331,17 +333,17 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) peer2.operation = NULL; } else - GNUNET_assert (0); + FAIL_TEST (0); if ((GNUNET_YES == peer1.is_running) && (GNUNET_YES == peer2.is_running)) { 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: - GNUNET_assert (PEERS_CONNECTED_2 == result); + FAIL_TEST (PEERS_CONNECTED_2 == result); if (event->details.peer_stop.peer == peer1.peer) { peer1.is_running = GNUNET_NO; @@ -355,7 +357,7 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) peer2.operation = GNUNET_TESTBED_peer_destroy (peer2.peer); } else - GNUNET_assert (0); + FAIL_TEST (0); if ((GNUNET_NO == peer1.is_running) && (GNUNET_NO == peer2.is_running)) result = PEERS_STOPPED; break; @@ -363,19 +365,36 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) switch (result) { case PEERS_STARTED: + 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)); + 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: - GNUNET_assert (NULL == peer1.operation); - GNUNET_assert (NULL == peer2.operation); - GNUNET_assert (NULL != common_operation); - GNUNET_assert ((event->details.peer_connect.peer1 == peer1.peer) && - (event->details.peer_connect.peer2 == peer2.peer)); + 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 (NULL, peer1.peer, NULL, NULL); + peer2.operation = GNUNET_TESTBED_peer_stop (NULL, peer2.peer, NULL, NULL); break; default: - GNUNET_assert (0); + FAIL_TEST (0); } break; default: - GNUNET_assert (0); + FAIL_TEST (0); }; } @@ -394,12 +413,12 @@ peer_create_cb (void *cls, struct GNUNET_TESTBED_Peer *peer, const char *emsg) { struct PeerContext *pc = cls; - GNUNET_assert (NULL != pc->operation); - GNUNET_assert (NULL != peer); - GNUNET_assert (NULL == pc->peer); + FAIL_TEST (NULL != pc->operation); + FAIL_TEST (NULL != peer); + FAIL_TEST (NULL == pc->peer); pc->peer = peer; GNUNET_TESTBED_operation_done (pc->operation); - pc->operation = GNUNET_TESTBED_peer_start (pc->peer, NULL, NULL); + pc->operation = GNUNET_TESTBED_peer_start (NULL, pc->peer, NULL, NULL); } @@ -412,7 +431,7 @@ peer_create_cb (void *cls, struct GNUNET_TESTBED_Peer *peer, const char *emsg) static void registration_comp (void *cls, const char *emsg) { - GNUNET_assert (cls == neighbour); + FAIL_TEST (cls == neighbour); reg_handle = NULL; peer1.operation = GNUNET_TESTBED_peer_create (controller, host, cfg, &peer_create_cb, @@ -420,8 +439,8 @@ registration_comp (void *cls, const char *emsg) peer2.operation = GNUNET_TESTBED_peer_create (controller, host, cfg, &peer_create_cb, &peer2); - GNUNET_assert (NULL != peer1.operation); - GNUNET_assert (NULL != peer2.operation); + FAIL_TEST (NULL != peer1.operation); + FAIL_TEST (NULL != peer2.operation); } @@ -435,26 +454,30 @@ registration_comp (void *cls, const char *emsg) * GNUNET_TESTBED_controller_stop() shouldn't be called in this case */ static void -status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, int status) +status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg_, int status) { uint64_t event_mask; - GNUNET_assert (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); event_mask |= (1L << GNUNET_TESTBED_ET_CONNECT); event_mask |= (1L << GNUNET_TESTBED_ET_OPERATION_FINISHED); controller = - GNUNET_TESTBED_controller_connect (cfg, host, event_mask, &controller_cb, + GNUNET_TESTBED_controller_connect (host, event_mask, &controller_cb, NULL); - GNUNET_assert (NULL != controller); - neighbour = GNUNET_TESTBED_host_create ("localhost", NULL, 0); - GNUNET_assert (NULL != neighbour); + FAIL_TEST (NULL != controller); + neighbour = GNUNET_TESTBED_host_create ("localhost", NULL, cfg, 0); + FAIL_TEST (NULL != neighbour); reg_handle = GNUNET_TESTBED_register_host (controller, neighbour, ®istration_comp, neighbour); - GNUNET_assert (NULL != reg_handle); + FAIL_TEST (NULL != reg_handle); } @@ -471,10 +494,10 @@ static void run (void *cls, char *const *args, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *config) { - host = GNUNET_TESTBED_host_create (NULL, NULL, 0); - GNUNET_assert (NULL != host); cfg = GNUNET_CONFIGURATION_dup (config); - cp = GNUNET_TESTBED_controller_start ("127.0.0.1", host, cfg, status_cb, + host = GNUNET_TESTBED_host_create (NULL, NULL, cfg, 0); + FAIL_TEST (NULL != host); + cp = GNUNET_TESTBED_controller_start ("127.0.0.1", host, status_cb, NULL); abort_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply