static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
+static char *directory;
static void
cleanup ()
{
GNUNET_assert (NULL != cls);
nsqe = NULL;
- if (GNUNET_SYSERR == success)
+ if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_break (0);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Namestore could not remove record: `%s'\n",
- emsg);
- GNUNET_SCHEDULER_shutdown ();
- return;
+ GNUNET_SCHEDULER_cancel (endbadly_task);
+ endbadly_task = GNUNET_SCHEDULER_NO_TASK;
}
- else if (GNUNET_OK == success)
- {
- res = 0;
- if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (endbadly_task);
- endbadly_task = GNUNET_SCHEDULER_NO_TASK;
- }
- GNUNET_SCHEDULER_add_now (&end, NULL);
+
+ switch (success) {
+ case GNUNET_NO:
+ /* We expected GNUNET_NO, since record was not found */
+ GNUNET_SCHEDULER_add_now (&end, NULL);
+ break;
+ case GNUNET_OK:
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Namestore could remove non-existing record: `%s'\n",
+ (NULL !=emsg) ? emsg : "");
+ GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+ break;
+ case GNUNET_SYSERR:
+ default:
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Namestore failed: `%s'\n",
+ (NULL !=emsg) ? emsg : "");
+ GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+ break;
}
}
char *hostkey_file;
const char * name = "dummy.dummy.gnunet";
+ directory = NULL;
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory);
+ GNUNET_DISK_directory_remove (directory);
+
endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&endbadly, NULL);
GNUNET_asprintf (&hostkey_file,
"test_namestore_api.conf",
&run,
NULL))
- return 1;
+ {
+ res = 1;
+ }
+ if (NULL != directory)
+ {
+ GNUNET_DISK_directory_remove (directory);
+ GNUNET_free (directory);
+ }
return res;
}