diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-09-25 14:19:38 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-09-25 14:19:38 +0000 |
commit | 992e1d7a51eac4e59e1751037b88f198d4f7014f (patch) | |
tree | d3e48ea84b6272ab8049beab0bcbe2dfbcfe19b1 /src/namestore/test_namestore_api_remove.c | |
parent | 161f45f41a34fd89f9bc47f094f72796ca04bce5 (diff) | |
download | gnunet-992e1d7a51eac4e59e1751037b88f198d4f7014f.tar.gz gnunet-992e1d7a51eac4e59e1751037b88f198d4f7014f.zip |
-fix remove testcase
Diffstat (limited to 'src/namestore/test_namestore_api_remove.c')
-rw-r--r-- | src/namestore/test_namestore_api_remove.c | 60 |
1 files changed, 26 insertions, 34 deletions
diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c index 4eab0c746..5e8b85544 100644 --- a/src/namestore/test_namestore_api_remove.c +++ b/src/namestore/test_namestore_api_remove.c | |||
@@ -141,39 +141,21 @@ rd_decrypt_cb (void *cls, | |||
141 | { | 141 | { |
142 | const char *name = cls; | 142 | const char *name = cls; |
143 | char rd_cmp_data[TEST_RECORD_DATALEN]; | 143 | char rd_cmp_data[TEST_RECORD_DATALEN]; |
144 | if (GNUNET_NO == removed) | 144 | |
145 | { | 145 | GNUNET_assert (GNUNET_NO == removed); |
146 | GNUNET_assert (1 == rd_count); | 146 | GNUNET_assert (1 == rd_count); |
147 | GNUNET_assert (NULL != rd); | 147 | GNUNET_assert (NULL != rd); |
148 | 148 | memset (rd_cmp_data, 'a', TEST_RECORD_DATALEN); | |
149 | memset (rd_cmp_data, 'a', TEST_RECORD_DATALEN); | 149 | |
150 | 150 | GNUNET_assert (TEST_RECORD_TYPE == rd[0].record_type); | |
151 | GNUNET_assert (TEST_RECORD_TYPE == rd[0].record_type); | 151 | GNUNET_assert (TEST_RECORD_DATALEN == rd[0].data_size); |
152 | GNUNET_assert (TEST_RECORD_DATALEN == rd[0].data_size); | 152 | GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN)); |
153 | GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN)); | 153 | |
154 | 154 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | |
155 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 155 | "Block was decrypted successfully, removing records \n"); |
156 | "Block was decrypted successfully, removing records \n"); | 156 | |
157 | 157 | nsqe = GNUNET_NAMESTORE_records_store (nsh, privkey, name, | |
158 | nsqe = GNUNET_NAMESTORE_records_store (nsh, privkey, name, | 158 | 0, NULL, &remove_cont, (void *) name); |
159 | 0, NULL, &remove_cont, (void *) name); | ||
160 | } | ||
161 | else | ||
162 | { | ||
163 | if ((0 != rd_count) /*|| (NULL != rd)*/) | ||
164 | { | ||
165 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
166 | _("Record was not removed \n")); | ||
167 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | ||
168 | GNUNET_SCHEDULER_cancel (endbadly_task); | ||
169 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | ||
170 | return; | ||
171 | } | ||
172 | |||
173 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | ||
174 | _("Record was removed \n")); | ||
175 | GNUNET_SCHEDULER_add_now (&end, NULL); | ||
176 | } | ||
177 | } | 159 | } |
178 | 160 | ||
179 | 161 | ||
@@ -184,6 +166,16 @@ name_lookup_proc (void *cls, | |||
184 | const char *name = cls; | 166 | const char *name = cls; |
185 | nsqe = NULL; | 167 | nsqe = NULL; |
186 | 168 | ||
169 | if (removed && (NULL == block)) | ||
170 | { | ||
171 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | ||
172 | { | ||
173 | GNUNET_SCHEDULER_cancel (endbadly_task); | ||
174 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | ||
175 | } | ||
176 | GNUNET_SCHEDULER_add_now (&end, NULL); | ||
177 | return; | ||
178 | } | ||
187 | GNUNET_assert (NULL != cls); | 179 | GNUNET_assert (NULL != cls); |
188 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) | 180 | if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) |
189 | { | 181 | { |
@@ -200,7 +192,7 @@ name_lookup_proc (void *cls, | |||
200 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); | 192 | endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL); |
201 | return; | 193 | return; |
202 | } | 194 | } |
203 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 195 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
204 | "Namestore returned block, decrypting \n"); | 196 | "Namestore returned block, decrypting \n"); |
205 | GNUNET_assert (GNUNET_OK == | 197 | GNUNET_assert (GNUNET_OK == |
206 | GNUNET_NAMESTORE_block_decrypt (block, | 198 | GNUNET_NAMESTORE_block_decrypt (block, |