aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/test_testbed_api_controllerlink.c
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2012-11-09 22:58:48 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2012-11-09 22:58:48 +0000
commitcd0023ab2cfba58a08d47ec2c3f287eca926d922 (patch)
tree011e76d2f2ec6ec77f52c606fc1135f71a08e38b /src/testbed/test_testbed_api_controllerlink.c
parentdcbe14551ddea5842816a3f8c7e5291b77e88292 (diff)
downloadgnunet-cd0023ab2cfba58a08d47ec2c3f287eca926d922.tar.gz
gnunet-cd0023ab2cfba58a08d47ec2c3f287eca926d922.zip
- increse timeouts and fixes
Diffstat (limited to 'src/testbed/test_testbed_api_controllerlink.c')
-rw-r--r--src/testbed/test_testbed_api_controllerlink.c10
1 files changed, 5 insertions, 5 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}