diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-03-18 13:11:36 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-03-18 13:11:36 +0000 |
commit | d0d39def77f1f81dd83823e0fe2cfe84a5393a74 (patch) | |
tree | 7c566f79daa839bc74569a415c1b0d2537263280 /src/testbed/test_testbed_api_controllerlink.c | |
parent | 153c0ba219f50e851aaef92d0cef28f80a33763e (diff) | |
download | gnunet-d0d39def77f1f81dd83823e0fe2cfe84a5393a74.tar.gz gnunet-d0d39def77f1f81dd83823e0fe2cfe84a5393a74.zip |
expose Operation and associated closure in every event
Diffstat (limited to 'src/testbed/test_testbed_api_controllerlink.c')
-rw-r--r-- | src/testbed/test_testbed_api_controllerlink.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c index c10451703..2f9e53b94 100644 --- a/src/testbed/test_testbed_api_controllerlink.c +++ b/src/testbed/test_testbed_api_controllerlink.c | |||
@@ -363,11 +363,11 @@ delay_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
363 | switch (result) | 363 | switch (result) |
364 | { | 364 | { |
365 | case SLAVE2_PEER_CREATE_SUCCESS: | 365 | case SLAVE2_PEER_CREATE_SUCCESS: |
366 | op = GNUNET_TESTBED_peer_stop (slave1_peer, NULL, NULL); | 366 | op = GNUNET_TESTBED_peer_stop (NULL, slave1_peer, NULL, NULL); |
367 | FAIL_TEST (NULL != op); | 367 | FAIL_TEST (NULL != op); |
368 | break; | 368 | break; |
369 | case MASTER_SLAVE2_PEERS_CONNECTED: | 369 | case MASTER_SLAVE2_PEERS_CONNECTED: |
370 | op = GNUNET_TESTBED_peer_stop (slave2_peer, NULL, NULL); | 370 | op = GNUNET_TESTBED_peer_stop (NULL, slave2_peer, NULL, NULL); |
371 | FAIL_TEST (NULL != op); | 371 | FAIL_TEST (NULL != op); |
372 | break; | 372 | break; |
373 | default: | 373 | default: |
@@ -432,8 +432,8 @@ check_operation_success (const struct GNUNET_TESTBED_EventInformation *event) | |||
432 | { | 432 | { |
433 | FAIL_TEST (NULL != event); | 433 | FAIL_TEST (NULL != event); |
434 | FAIL_TEST (GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type); | 434 | FAIL_TEST (GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type); |
435 | FAIL_TEST (event->details.operation_finished.operation == op); | 435 | FAIL_TEST (event->op == op); |
436 | FAIL_TEST (NULL == event->details.operation_finished.op_cls); | 436 | FAIL_TEST (NULL == event->op_cls); |
437 | FAIL_TEST (NULL == event->details.operation_finished.emsg); | 437 | FAIL_TEST (NULL == event->details.operation_finished.emsg); |
438 | FAIL_TEST (NULL == event->details.operation_finished.generic); | 438 | FAIL_TEST (NULL == event->details.operation_finished.generic); |
439 | } | 439 | } |
@@ -562,8 +562,8 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) | |||
562 | case SLAVE3_STARTED: | 562 | case SLAVE3_STARTED: |
563 | FAIL_TEST (NULL != event); | 563 | FAIL_TEST (NULL != event); |
564 | FAIL_TEST (GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type); | 564 | FAIL_TEST (GNUNET_TESTBED_ET_OPERATION_FINISHED == event->type); |
565 | FAIL_TEST (event->details.operation_finished.operation == op); | 565 | FAIL_TEST (event->op == op); |
566 | FAIL_TEST (NULL == event->details.operation_finished.op_cls); | 566 | FAIL_TEST (NULL == event->op_cls); |
567 | FAIL_TEST (NULL == event->details.operation_finished.emsg); | 567 | FAIL_TEST (NULL == event->details.operation_finished.emsg); |
568 | cfg3 = GNUNET_CONFIGURATION_dup (event->details.operation_finished.generic); | 568 | cfg3 = GNUNET_CONFIGURATION_dup (event->details.operation_finished.generic); |
569 | GNUNET_TESTBED_operation_done (op); | 569 | GNUNET_TESTBED_operation_done (op); |