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

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

diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c
index 3e5014d8eb1aa8050c96aa389a71af5f9b0e6a52..77a3d6a387b5345f7f51e4ea330989e60159e451 100644 (file)
--- a/src/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/src/namestore/test_namestore_api_zone_iteration_stop.c
@@ -34,9 +34,9 @@ static struct GNUNET_NAMESTORE_Handle * nsh;
 
 static GNUNET_SCHEDULER_TaskIdentifier endbadly_task;
 
-static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
+static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey;
 
-static struct GNUNET_CRYPTO_EccPrivateKey * privkey2;
+static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey2;
 
 static struct GNUNET_NAMESTORE_ZoneIterator *zi;
 
@@ -46,15 +46,17 @@ static int returned_records;
 
 static char * s_name_1;
 
-static struct GNUNET_NAMESTORE_RecordData *s_rd_1;
+static struct GNUNET_GNSRECORD_Data *s_rd_1;
 
 static char * s_name_2;
 
-static struct GNUNET_NAMESTORE_RecordData *s_rd_2;
+static struct GNUNET_GNSRECORD_Data *s_rd_2;
 
 static char * s_name_3;
 
-static struct GNUNET_NAMESTORE_RecordData *s_rd_3;
+static struct GNUNET_GNSRECORD_Data *s_rd_3;
+
+static char *directory;
 
 
 /**
@@ -103,6 +105,12 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   if (privkey2 != NULL)
     GNUNET_free (privkey2);
   privkey2 = NULL;
+
+  if (NULL != directory)
+  {
+      GNUNET_DISK_directory_remove (directory);
+      GNUNET_free (directory);
+  }
   res = 1;
 }
 
@@ -110,11 +118,11 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 static void
 end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-       if (NULL != zi)
-       {
-               GNUNET_NAMESTORE_zone_iteration_stop (zi);
-               zi = NULL;
-       }
+  if (NULL != zi)
+    {
+      GNUNET_NAMESTORE_zone_iteration_stop (zi);
+      zi = NULL;
+    }
 
   if (endbadly_task != GNUNET_SCHEDULER_NO_TASK)
   {
@@ -156,10 +164,10 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void
 zone_proc (void *cls,
-                                        const struct GNUNET_CRYPTO_EccPrivateKey *zone,
-                                        const char *label,
-                                        unsigned int rd_count,
-                                        const struct GNUNET_NAMESTORE_RecordData *rd)
+           const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+           const char *label,
+           unsigned int rd_count,
+           const struct GNUNET_GNSRECORD_Data *rd)
 {
   int failed = GNUNET_NO;
   if ((zone == NULL) && (label == NULL))
@@ -178,13 +186,13 @@ zone_proc (void *cls,
   }
   else
   {
-       if (0 == memcmp (zone, privkey, sizeof (struct GNUNET_CRYPTO_EccPrivateKey)))
+       if (0 == memcmp (zone, privkey, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
        {
       if (0 == strcmp (label, s_name_1))
       {
         if (rd_count == 1)
         {
-          if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_1))
+          if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_1))
           {
             failed = GNUNET_YES;
             GNUNET_break (0);
@@ -200,7 +208,7 @@ zone_proc (void *cls,
       {
         if (rd_count == 1)
         {
-          if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_2))
+          if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_2))
           {
             failed = GNUNET_YES;
             GNUNET_break (0);
@@ -222,13 +230,13 @@ zone_proc (void *cls,
         GNUNET_break (0);
       }
        }
-       else if (0 == memcmp (zone, privkey2, sizeof (struct GNUNET_CRYPTO_EccPrivateKey)))
+       else if (0 == memcmp (zone, privkey2, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
        {
       if (0 == strcmp (label, s_name_3))
       {
         if (rd_count == 1)
         {
-          if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_3))
+          if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_3))
           {
             failed = GNUNET_YES;
             GNUNET_break (0);
@@ -331,19 +339,20 @@ put_cont (void *cls, int32_t success, const char *emsg)
 }
 
 
-static struct GNUNET_NAMESTORE_RecordData *
+static struct GNUNET_GNSRECORD_Data *
 create_record (unsigned int count)
 {
   unsigned int c;
-  struct GNUNET_NAMESTORE_RecordData * rd;
+  struct GNUNET_GNSRECORD_Data * rd;
 
-  rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
+  rd = GNUNET_malloc (count * sizeof (struct GNUNET_GNSRECORD_Data));
   for (c = 0; c < count; c++)
   {
     rd[c].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS).abs_value_us;
     rd[c].record_type = 1111;
     rd[c].data_size = 50;
     rd[c].data = GNUNET_malloc(50);
+    rd[c].flags = 0;
     memset ((char *) rd[c].data, 'a', 50);
   }
   return rd;
@@ -357,10 +366,10 @@ create_record (unsigned int count)
  */
 static void
 empty_zone_proc (void *cls,
-                const struct GNUNET_CRYPTO_EccPrivateKey *zone,
+                const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
                 const char *label,
                 unsigned int rd_count,
-                const struct GNUNET_NAMESTORE_RecordData *rd)
+                const struct GNUNET_GNSRECORD_Data *rd)
 {
   char *hostkey_file;
 
@@ -391,14 +400,14 @@ empty_zone_proc (void *cls,
   GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
       "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
-  privkey = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file);
+  privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
   GNUNET_free (hostkey_file);
   GNUNET_assert (privkey != NULL);
 
   GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
       "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey");
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file);
-  privkey2 = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file);
+  privkey2 = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
   GNUNET_free (hostkey_file);
   GNUNET_assert (privkey2 != NULL);
 
@@ -430,6 +439,9 @@ run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle *cfg,
      struct GNUNET_TESTING_Peer *peer)
 {
+  directory = NULL;
+  GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory);
+
   endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT, &endbadly, NULL);
   nsh = GNUNET_NAMESTORE_connect (cfg);
   GNUNET_break (NULL != nsh);
@@ -449,13 +461,13 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
+  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-namestore/");
   res = 1;
-  if (0 != 
-      GNUNET_TESTING_service_run ("test-namestore-api-zone-iteration-stop",
-                                 "namestore",
-                                 "test_namestore_api.conf",
-                                 &run,
-                                 NULL))
+  if (0 !=
+      GNUNET_TESTING_peer_run ("test-namestore-api-zone-iteration-stop",
+                               "test_namestore_api.conf",
+                               &run,
+                               NULL))
     return 1;
   return res;
 }