diff options
-rw-r--r-- | src/testbed/test_testbed_api_controllerlink.c | 12 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_statistics.c | 14 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_topology.c | 3 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_topology_clique.c | 3 | ||||
-rw-r--r-- | src/testbed/test_testbed_logger_api.c | 2 | ||||
-rw-r--r-- | src/testing/testing.c | 6 |
6 files changed, 33 insertions, 7 deletions
diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c index c60b8227e..471ab3a94 100644 --- a/src/testbed/test_testbed_api_controllerlink.c +++ b/src/testbed/test_testbed_api_controllerlink.c | |||
@@ -181,7 +181,12 @@ enum Stage | |||
181 | SLAVE3_LINK_SUCCESS, | 181 | SLAVE3_LINK_SUCCESS, |
182 | 182 | ||
183 | /** | 183 | /** |
184 | * Destory master peer and mark test as success | 184 | * Master peer destoryed. Destory slave 3 peer |
185 | */ | ||
186 | MASTER_PEER_DESTROY_SUCCESS, | ||
187 | |||
188 | /** | ||
189 | * Slave 3 peer destroyed. Mark test as success | ||
185 | */ | 190 | */ |
186 | SUCCESS, | 191 | SUCCESS, |
187 | 192 | ||
@@ -631,6 +636,11 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) | |||
631 | break; | 636 | break; |
632 | case SLAVE3_LINK_SUCCESS: | 637 | case SLAVE3_LINK_SUCCESS: |
633 | check_operation_success (event); | 638 | check_operation_success (event); |
639 | result = MASTER_PEER_DESTROY_SUCCESS; | ||
640 | GNUNET_TESTBED_operation_done (op); | ||
641 | op = GNUNET_TESTBED_peer_destroy (slave3_peer); | ||
642 | break; | ||
643 | case MASTER_PEER_DESTROY_SUCCESS: | ||
634 | result = SUCCESS; | 644 | result = SUCCESS; |
635 | GNUNET_TESTBED_operation_done (op); | 645 | GNUNET_TESTBED_operation_done (op); |
636 | op = NULL; | 646 | op = NULL; |
diff --git a/src/testbed/test_testbed_api_statistics.c b/src/testbed/test_testbed_api_statistics.c index bc01f6bc8..463dc736e 100644 --- a/src/testbed/test_testbed_api_statistics.c +++ b/src/testbed/test_testbed_api_statistics.c | |||
@@ -59,6 +59,17 @@ static GNUNET_SCHEDULER_TaskIdentifier abort_task; | |||
59 | static int result; | 59 | static int result; |
60 | 60 | ||
61 | /** | 61 | /** |
62 | * The peers we have seen in the statistics iterator | ||
63 | */ | ||
64 | static struct GNUNET_TESTBED_Peer **seen_peers; | ||
65 | |||
66 | /** | ||
67 | * Number of peers in the above array | ||
68 | */ | ||
69 | static unsigned int num_seen_peers; | ||
70 | |||
71 | |||
72 | /** | ||
62 | * Fail testcase | 73 | * Fail testcase |
63 | */ | 74 | */ |
64 | #define FAIL_TEST(cond, ret) do { \ | 75 | #define FAIL_TEST(cond, ret) do { \ |
@@ -109,8 +120,6 @@ stats_iterator (void *cls, | |||
109 | const char *subsystem, const char *name, uint64_t value, | 120 | const char *subsystem, const char *name, uint64_t value, |
110 | int is_persistent) | 121 | int is_persistent) |
111 | { | 122 | { |
112 | static struct GNUNET_TESTBED_Peer **seen_peers; | ||
113 | static unsigned int num_seen_peers; | ||
114 | unsigned int cnt; | 123 | unsigned int cnt; |
115 | 124 | ||
116 | FAIL_TEST (cls == dummy_cls, return GNUNET_SYSERR); | 125 | FAIL_TEST (cls == dummy_cls, return GNUNET_SYSERR); |
@@ -187,6 +196,7 @@ main (int argc, char **argv) | |||
187 | NUM_PEERS, | 196 | NUM_PEERS, |
188 | 1LL, NULL, NULL, | 197 | 1LL, NULL, NULL, |
189 | &test_master, NULL); | 198 | &test_master, NULL); |
199 | GNUNET_free_non_null (seen_peers); | ||
190 | if (GNUNET_OK != result) | 200 | if (GNUNET_OK != result) |
191 | return 1; | 201 | return 1; |
192 | return 0; | 202 | return 0; |
diff --git a/src/testbed/test_testbed_api_topology.c b/src/testbed/test_testbed_api_topology.c index 4933f4793..e8f1c55be 100644 --- a/src/testbed/test_testbed_api_topology.c +++ b/src/testbed/test_testbed_api_topology.c | |||
@@ -94,7 +94,8 @@ controller_event_cb (void *cls, | |||
94 | if ((NUM_PEERS) == overlay_connects) | 94 | if ((NUM_PEERS) == overlay_connects) |
95 | { | 95 | { |
96 | result = GNUNET_OK; | 96 | result = GNUNET_OK; |
97 | GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); | 97 | GNUNET_SCHEDULER_cancel (shutdown_task); |
98 | shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); | ||
98 | } | 99 | } |
99 | break; | 100 | break; |
100 | case GNUNET_TESTBED_ET_OPERATION_FINISHED: | 101 | case GNUNET_TESTBED_ET_OPERATION_FINISHED: |
diff --git a/src/testbed/test_testbed_api_topology_clique.c b/src/testbed/test_testbed_api_topology_clique.c index 7b8c802a0..30cce6c0d 100644 --- a/src/testbed/test_testbed_api_topology_clique.c +++ b/src/testbed/test_testbed_api_topology_clique.c | |||
@@ -94,7 +94,8 @@ controller_event_cb (void *cls, | |||
94 | if ((NUM_PEERS * (NUM_PEERS - 1)) == overlay_connects) | 94 | if ((NUM_PEERS * (NUM_PEERS - 1)) == overlay_connects) |
95 | { | 95 | { |
96 | result = GNUNET_OK; | 96 | result = GNUNET_OK; |
97 | GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); | 97 | GNUNET_SCHEDULER_cancel (shutdown_task); |
98 | shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); | ||
98 | } | 99 | } |
99 | break; | 100 | break; |
100 | case GNUNET_TESTBED_ET_OPERATION_FINISHED: | 101 | case GNUNET_TESTBED_ET_OPERATION_FINISHED: |
diff --git a/src/testbed/test_testbed_logger_api.c b/src/testbed/test_testbed_logger_api.c index bbc9e33d2..a8ed3d22c 100644 --- a/src/testbed/test_testbed_logger_api.c +++ b/src/testbed/test_testbed_logger_api.c | |||
@@ -90,6 +90,8 @@ shutdown_now () | |||
90 | CANCEL_TASK (abort_task); | 90 | CANCEL_TASK (abort_task); |
91 | CANCEL_TASK (write_task); | 91 | CANCEL_TASK (write_task); |
92 | GNUNET_free_non_null (search_dir); | 92 | GNUNET_free_non_null (search_dir); |
93 | if (NULL != h) | ||
94 | GNUNET_TESTBED_LOGGER_disconnect (h); | ||
93 | GNUNET_SCHEDULER_shutdown (); | 95 | GNUNET_SCHEDULER_shutdown (); |
94 | } | 96 | } |
95 | 97 | ||
diff --git a/src/testing/testing.c b/src/testing/testing.c index db74f8897..66fcf11da 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c | |||
@@ -1201,10 +1201,12 @@ GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system, | |||
1201 | | GNUNET_DISK_PERM_USER_WRITE); | 1201 | | GNUNET_DISK_PERM_USER_WRITE); |
1202 | if (NULL == fd) | 1202 | if (NULL == fd) |
1203 | { | 1203 | { |
1204 | GNUNET_asprintf (&emsg_, _("Cannot open hostkey file: %s\n"), | 1204 | GNUNET_asprintf (&emsg_, _("Cannot open hostkey file `%s': %s\n"), |
1205 | STRERROR (errno)); | 1205 | hostkey_filename, STRERROR (errno)); |
1206 | GNUNET_free (hostkey_filename); | ||
1206 | goto err_ret; | 1207 | goto err_ret; |
1207 | } | 1208 | } |
1209 | GNUNET_free (hostkey_filename); | ||
1208 | if (GNUNET_TESTING_HOSTKEYFILESIZE != | 1210 | if (GNUNET_TESTING_HOSTKEYFILESIZE != |
1209 | GNUNET_DISK_file_write (fd, system->hostkeys_data | 1211 | GNUNET_DISK_file_write (fd, system->hostkeys_data |
1210 | + (key_number * GNUNET_TESTING_HOSTKEYFILESIZE), | 1212 | + (key_number * GNUNET_TESTING_HOSTKEYFILESIZE), |