aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/test_testbed_api.c
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2013-03-18 13:11:36 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2013-03-18 13:11:36 +0000
commitd0d39def77f1f81dd83823e0fe2cfe84a5393a74 (patch)
tree7c566f79daa839bc74569a415c1b0d2537263280 /src/testbed/test_testbed_api.c
parent153c0ba219f50e851aaef92d0cef28f80a33763e (diff)
downloadgnunet-d0d39def77f1f81dd83823e0fe2cfe84a5393a74.tar.gz
gnunet-d0d39def77f1f81dd83823e0fe2cfe84a5393a74.zip
expose Operation and associated closure in every event
Diffstat (limited to 'src/testbed/test_testbed_api.c')
-rw-r--r--src/testbed/test_testbed_api.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c
index 2927c3798..75e11211f 100644
--- a/src/testbed/test_testbed_api.c
+++ b/src/testbed/test_testbed_api.c
@@ -223,7 +223,7 @@ dht_disconnect_adapter (void *cls, void *op_result)
223 dht_handle = NULL; 223 dht_handle = NULL;
224 FAIL_TEST (PEER_SERVICE_CONNECT == sub_test, return); 224 FAIL_TEST (PEER_SERVICE_CONNECT == sub_test, return);
225 FAIL_TEST (NULL != operation, return); 225 FAIL_TEST (NULL != operation, return);
226 operation = GNUNET_TESTBED_peer_stop (peer, NULL, NULL); 226 operation = GNUNET_TESTBED_peer_stop (NULL, peer, NULL, NULL);
227 FAIL_TEST (NULL != operation, return); 227 FAIL_TEST (NULL != operation, return);
228} 228}
229 229
@@ -307,16 +307,16 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
307 switch (sub_test) 307 switch (sub_test)
308 { 308 {
309 case PEER_DESTROY: 309 case PEER_DESTROY:
310 FAIL_TEST (event->details.operation_finished.operation == operation, return); 310 FAIL_TEST (event->op == operation, return);
311 FAIL_TEST (NULL == event->details.operation_finished.op_cls, return); 311 FAIL_TEST (NULL == event->op_cls, return);
312 FAIL_TEST (NULL == event->details.operation_finished.emsg, return); 312 FAIL_TEST (NULL == event->details.operation_finished.emsg, return);
313 FAIL_TEST (NULL == event->details.operation_finished.generic, return); 313 FAIL_TEST (NULL == event->details.operation_finished.generic, return);
314 GNUNET_TESTBED_operation_done (operation); 314 GNUNET_TESTBED_operation_done (operation);
315 GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); 315 GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
316 break; 316 break;
317 case PEER_SERVICE_CONNECT: 317 case PEER_SERVICE_CONNECT:
318 FAIL_TEST (event->details.operation_finished.operation == operation, return); 318 FAIL_TEST (event->op == operation, return);
319 FAIL_TEST (NULL == event->details.operation_finished.op_cls, return); 319 FAIL_TEST (NULL == event->op_cls, return);
320 FAIL_TEST (NULL == event->details.operation_finished.emsg, return); 320 FAIL_TEST (NULL == event->details.operation_finished.emsg, return);
321 FAIL_TEST (NULL != dht_handle, return); 321 FAIL_TEST (NULL != dht_handle, return);
322 FAIL_TEST (event->details.operation_finished.generic == dht_handle, return); 322 FAIL_TEST (event->details.operation_finished.generic == dht_handle, return);