-fix #3301

[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 f7fd4203d84100e9819bd3da75f5bac9945d6189..adfd234c63c84369692ad08a69ffba0c531effd4 100644 (file)
--- a/src/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/src/namestore/test_namestore_api_zone_iteration_stop.c
@@ -56,6 +56,8 @@ static char * s_name_3;
 
 static struct GNUNET_GNSRECORD_Data *s_rd_3;
 
+static char *directory;
+
 
 /**
  * Re-establish the connection to the service.
@@ -110,11 +112,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 +158,10 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 static void
 zone_proc (void *cls,
-                                        const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
-                                        const char *label,
-                                        unsigned int rd_count,
-                                        const struct GNUNET_GNSRECORD_Data *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))
@@ -344,6 +346,7 @@ create_record (unsigned int count)
     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;
@@ -430,6 +433,10 @@ 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);
+  GNUNET_DISK_directory_remove (directory);
+
   endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT, &endbadly, NULL);
   nsh = GNUNET_NAMESTORE_connect (cfg);
   GNUNET_break (NULL != nsh);
@@ -449,15 +456,20 @@ 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))
-    return 1;
+      GNUNET_TESTING_peer_run ("test-namestore-api-zone-iteration-stop",
+                               "test_namestore_api.conf",
+                               &run,
+                               NULL))
+  {
+    res = 1;
+  }
+  if (NULL != directory)
+  {
+      GNUNET_DISK_directory_remove (directory);
+      GNUNET_free (directory);
+  }
   return res;
 }