diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-11-09 22:58:48 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-11-09 22:58:48 +0000 |
commit | cd0023ab2cfba58a08d47ec2c3f287eca926d922 (patch) | |
tree | 011e76d2f2ec6ec77f52c606fc1135f71a08e38b /src | |
parent | dcbe14551ddea5842816a3f8c7e5291b77e88292 (diff) | |
download | gnunet-cd0023ab2cfba58a08d47ec2c3f287eca926d922.tar.gz gnunet-cd0023ab2cfba58a08d47ec2c3f287eca926d922.zip |
- increse timeouts and fixes
Diffstat (limited to 'src')
-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 78a9b8a93..da9fd000b 100644 --- a/src/testbed/test_testbed_api_controllerlink.c +++ b/src/testbed/test_testbed_api_controllerlink.c | |||
@@ -166,9 +166,9 @@ enum Stage | |||
166 | SLAVE3_LINK_SUCCESS, | 166 | SLAVE3_LINK_SUCCESS, |
167 | 167 | ||
168 | /** | 168 | /** |
169 | * Destory master peer | 169 | * Destory master peer and mark test as success |
170 | */ | 170 | */ |
171 | MASTER_PEER_DESTROY_SUCCESS | 171 | SUCCESS |
172 | 172 | ||
173 | }; | 173 | }; |
174 | 174 | ||
@@ -538,7 +538,7 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) | |||
538 | break; | 538 | break; |
539 | case SLAVE3_LINK_SUCCESS: | 539 | case SLAVE3_LINK_SUCCESS: |
540 | check_operation_success (event); | 540 | check_operation_success (event); |
541 | result = MASTER_PEER_DESTROY_SUCCESS; | 541 | result = SUCCESS; |
542 | GNUNET_TESTBED_operation_done (op); | 542 | GNUNET_TESTBED_operation_done (op); |
543 | op = NULL; | 543 | op = NULL; |
544 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 544 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
@@ -653,7 +653,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
653 | "Unable to run the test as this system is not configured " | 653 | "Unable to run the test as this system is not configured " |
654 | "to use password less SSH logins to localhost.\n" | 654 | "to use password less SSH logins to localhost.\n" |
655 | "Marking test as successful\n"); | 655 | "Marking test as successful\n"); |
656 | result = SLAVE3_LINK_SUCCESS; | 656 | result = SUCCESS; |
657 | return; | 657 | return; |
658 | } | 658 | } |
659 | cfg = GNUNET_CONFIGURATION_dup (config); | 659 | cfg = GNUNET_CONFIGURATION_dup (config); |
@@ -686,7 +686,7 @@ main (int argc, char **argv) | |||
686 | GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, | 686 | GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, |
687 | "test_testbed_api_controllerlink", "nohelp", options, | 687 | "test_testbed_api_controllerlink", "nohelp", options, |
688 | &run, NULL); | 688 | &run, NULL); |
689 | if ((GNUNET_OK != ret) || (MASTER_PEER_DESTROY_SUCCESS != result)) | 689 | if ((GNUNET_OK != ret) || (SUCCESS != result)) |
690 | return 1; | 690 | return 1; |
691 | return 0; | 691 | return 0; |
692 | } | 692 | } |
diff --git a/src/testbed/test_testbed_api_testbed_run.c b/src/testbed/test_testbed_api_testbed_run.c index ceb977bb2..2559523e6 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, | |||
156 | NULL, &master_task, NULL); | 156 | NULL, &master_task, NULL); |
157 | abort_task = | 157 | abort_task = |
158 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 158 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
159 | (GNUNET_TIME_UNIT_SECONDS, 60), &do_abort, | 159 | (GNUNET_TIME_UNIT_SECONDS, 300), &do_abort, |
160 | NULL); | 160 | NULL); |
161 | } | 161 | } |
162 | 162 | ||
diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c index af3890ea5..f456c49c7 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, | |||
139 | NUM_PEERS, GNUNET_TESTBED_TOPOLOGY_OPTION_END); | 139 | NUM_PEERS, GNUNET_TESTBED_TOPOLOGY_OPTION_END); |
140 | GNUNET_assert (NULL != op); | 140 | GNUNET_assert (NULL != op); |
141 | shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 141 | shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
142 | (GNUNET_TIME_UNIT_SECONDS, 120), | 142 | (GNUNET_TIME_UNIT_SECONDS, 300), |
143 | do_shutdown, NULL); | 143 | do_shutdown, NULL); |
144 | } | 144 | } |
145 | 145 | ||
diff --git a/src/testbed/test_testbed_api_topology_clique.c b/src/testbed/test_testbed_api_topology_clique.c index f1330277b..34afae883 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, | |||
141 | GNUNET_TESTBED_TOPOLOGY_OPTION_END); | 141 | GNUNET_TESTBED_TOPOLOGY_OPTION_END); |
142 | GNUNET_assert (NULL != op); | 142 | GNUNET_assert (NULL != op); |
143 | shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 143 | shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
144 | (GNUNET_TIME_UNIT_SECONDS, 120), | 144 | (GNUNET_TIME_UNIT_SECONDS, 300), |
145 | do_shutdown, NULL); | 145 | do_shutdown, NULL); |
146 | } | 146 | } |
147 | 147 | ||