More fixes for #3522

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

diff --git a/src/namestore/test_namestore_api_lookup_private.c b/src/namestore/test_namestore_api_lookup_private.c
index 1678ba9700bb454a55e2d53eefce1a26e32c17dd..ca03bf4896a2202a8737369f846647a798e8ee0f 100644 (file)
--- a/src/namestore/test_namestore_api_lookup_private.c
+++ b/src/namestore/test_namestore_api_lookup_private.c
@@ -45,7 +45,10 @@ static int res;
 
 static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
 
-static const char * name = "dummy.dummy.gnunet";
+//static const char * name = "dummy.dummy.gnunet";
+static const char * name = "d";
+
+static char *directory;
 
 static void
 cleanup ()
@@ -96,13 +99,45 @@ void lookup_it (void *cls,
                 unsigned int rd_count,
                 const struct GNUNET_GNSRECORD_Data *rd)
 {
- /* Check here */
+  nsqe = NULL;
+
+  if (0 != memcmp(privkey, zone, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)))
+  {
+    GNUNET_break(0);
+    GNUNET_SCHEDULER_cancel (endbadly_task);
+    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL );
+    return;
+  }
 
 
+  if (NULL == label)
+  {
+    GNUNET_break(0);
+    GNUNET_SCHEDULER_cancel (endbadly_task);
+    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL );
+    return;
+  }
+
+  if (0 != strcmp (label, name))
+  {
+    GNUNET_break(0);
+    GNUNET_SCHEDULER_cancel (endbadly_task);
+    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL );
+    return;
+  }
+
+  if (1 != rd_count)
+  {
+    GNUNET_break(0);
+    GNUNET_SCHEDULER_cancel (endbadly_task);
+    endbadly_task = GNUNET_SCHEDULER_add_now (&endbadly, NULL );
+    return;
+  }
+
   /* Done */
   GNUNET_SCHEDULER_cancel (endbadly_task);
   endbadly_task = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_SCHEDULER_add_now (&end, NULL);
+  GNUNET_SCHEDULER_add_now (&end, NULL );
 }
 
 
@@ -137,6 +172,10 @@ run (void *cls,
   struct GNUNET_GNSRECORD_Data rd;
   char *hostkey_file;
 
+  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,
@@ -153,6 +192,7 @@ run (void *cls,
   rd.record_type = TEST_RECORD_TYPE;
   rd.data_size = TEST_RECORD_DATALEN;
   rd.data = GNUNET_malloc (TEST_RECORD_DATALEN);
+  rd.flags = 0;
   memset ((char *) rd.data, 'a', TEST_RECORD_DATALEN);
 
   nsh = GNUNET_NAMESTORE_connect (cfg);
@@ -178,7 +218,14 @@ main (int argc, char *argv[])
                                "test_namestore_api.conf",
                                &run,
                                NULL))
-    return 1;
+  {
+    res = 1;
+  }
+  if (NULL != directory)
+  {
+      GNUNET_DISK_directory_remove (directory);
+      GNUNET_free (directory);
+  }
   return res;
 }