diff options
| -rw-r--r-- | src/testbed/test_testbed_api_controllerlink.c | 10 | ||||
| -rw-r--r-- | src/testbed/test_testbed_api_testbed_run.c | 2 | ||||
| -rw-r--r-- | src/testbed/test_testbed_api_topology.c | 2 | ||||
| -rw-r--r-- | src/testbed/test_testbed_api_topology_clique.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c index 78a9b8a93f..da9fd000b8 100644 --- a/src/testbed/test_testbed_api_controllerlink.c +++ b/src/testbed/test_testbed_api_controllerlink.c @@ -166,9 +166,9 @@ enum Stage SLAVE3_LINK_SUCCESS, /** - * Destory master peer + * Destory master peer and mark test as success */ - MASTER_PEER_DESTROY_SUCCESS + SUCCESS }; @@ -538,7 +538,7 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) break; case SLAVE3_LINK_SUCCESS: check_operation_success (event); - result = MASTER_PEER_DESTROY_SUCCESS; + result = SUCCESS; GNUNET_TESTBED_operation_done (op); op = NULL; GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply @@ -653,7 +653,7 @@ run (void *cls, char *const *args, const char *cfgfile, "Unable to run the test as this system is not configured " "to use password less SSH logins to localhost.\n" "Marking test as successful\n"); - result = SLAVE3_LINK_SUCCESS; + result = SUCCESS; return; } cfg = GNUNET_CONFIGURATION_dup (config); @@ -686,7 +686,7 @@ main (int argc, char **argv) GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, "test_testbed_api_controllerlink", "nohelp", options, &run, NULL); - if ((GNUNET_OK != ret) || (MASTER_PEER_DESTROY_SUCCESS != result)) + if ((GNUNET_OK != ret) || (SUCCESS != result)) return 1; return 0; } diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c index ceb977bb28..2559523e69 100644 --- a/src/testbed/test_testbed_api_testbed_run.c +++ b/src/testbed/test_testbed_api_testbed_run.c @@ -156,7 +156,7 @@ run (void *cls, char *const *args, const char *cfgfile, NULL, &master_task, NULL); abort_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_SECONDS, 60), &do_abort, + (GNUNET_TIME_UNIT_SECONDS, 300), &do_abort, NULL); } diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c index af3890ea56..f456c49c72 100644 --- a/src/testbed/test_testbed_api_topology.c +++ b/src/testbed/test_testbed_api_topology.c @@ -139,7 +139,7 @@ test_master (void *cls, unsigned int num_peers, NUM_PEERS, GNUNET_TESTBED_TOPOLOGY_OPTION_END); GNUNET_assert (NULL != op); shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_SECONDS, 120), + (GNUNET_TIME_UNIT_SECONDS, 300), do_shutdown, NULL); } diff --git a/src/testbed/test_testbed_api_topology_clique.c b/src/testbed/test_testbed_api_topology_clique.c index f1330277b1..34afae883e 100644 --- a/src/testbed/test_testbed_api_topology_clique.c +++ b/src/testbed/test_testbed_api_topology_clique.c @@ -141,7 +141,7 @@ test_master (void *cls, unsigned int num_peers, GNUNET_TESTBED_TOPOLOGY_OPTION_END); GNUNET_assert (NULL != op); shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_SECONDS, 120), + (GNUNET_TIME_UNIT_SECONDS, 300), do_shutdown, NULL); } |