- Tests did not clean up: TEST_HOME with namestore db was not removed after test

[oweals/gnunet.git] / src / namestore / test_namestore_api_remove_not_existing_record.c

diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c b/src/namestore/test_namestore_api_remove_not_existing_record.c
index 362a180824b6929e8607b8c24fe06435e63cdc93..c3afee6ff120b9256057f81a9cf5667b8ad1b222 100644 (file)
--- a/src/namestore/test_namestore_api_remove_not_existing_record.c
+++ b/src/namestore/test_namestore_api_remove_not_existing_record.c
@@ -46,6 +46,7 @@ static int res;
 
 static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
 
+static char *directory;
 
 static void
 cleanup ()
@@ -60,6 +61,11 @@ cleanup ()
     GNUNET_free (privkey);
     privkey = NULL;
   }
+  if (NULL != directory)
+  {
+      GNUNET_DISK_directory_remove (directory);
+      GNUNET_free (directory);
+  }
   GNUNET_SCHEDULER_shutdown ();
 }
 
@@ -97,24 +103,30 @@ put_cont (void *cls, int32_t success, const char *emsg)
 {
   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;
   }
 }
 
@@ -127,6 +139,9 @@ run (void *cls,
   char *hostkey_file;
   const char * name = "dummy.dummy.gnunet";
 
+  directory = NULL;
+  GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory);
+
   endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
                                                &endbadly, NULL);
   GNUNET_asprintf (&hostkey_file,