More fixes for #3522

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

diff --git a/src/namestore/test_namestore_api_lookup_shadow_filter.c b/src/namestore/test_namestore_api_lookup_shadow_filter.c
index 538ecf007e592c19caeb83537be8a22b42c59bd2..b7d04b143a76aa2614942c70b9c1b2079ba39664 100644 (file)
--- a/src/namestore/test_namestore_api_lookup_shadow_filter.c
+++ b/src/namestore/test_namestore_api_lookup_shadow_filter.c
@@ -36,7 +36,7 @@
 #define TEST_SHADOW_RECORD_DATA 'b'
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100)
-#define EXPIRATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2)
+#define EXPIRATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
 
 static struct GNUNET_NAMESTORE_Handle *nsh;
 
@@ -66,6 +66,8 @@ static struct GNUNET_HashCode derived_hash;
 
 static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
 
+static char *directory;
+
 static void
 cleanup ()
 {
@@ -149,10 +151,30 @@ rd_decrypt_cb (void *cls,
   {
     /* Expecting active record */
     memset (rd_cmp_data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
-    GNUNET_assert (TEST_RECORD_TYPE == rd[0].record_type);
-    GNUNET_assert (TEST_RECORD_DATALEN == rd[0].data_size);
-    GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN));
-    GNUNET_assert (0 == (GNUNET_GNSRECORD_RF_SHADOW_RECORD & rd[0].flags));
+    if (TEST_RECORD_TYPE != rd[0].record_type)
+    {
+      GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+      GNUNET_break (0);
+      return;
+    }
+    if (TEST_RECORD_DATALEN != rd[0].data_size)
+    {
+      GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+      GNUNET_break (0);
+      return;
+    }
+    if (0 != memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN))
+    {
+      GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+      GNUNET_break (0);
+      return;
+    }
+    if (0 != (GNUNET_GNSRECORD_RF_SHADOW_RECORD & rd[0].flags))
+    {
+      GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+      GNUNET_break (0);
+      return;
+    }
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Block was decrypted successfully with active record\n");
   }
@@ -160,10 +182,30 @@ rd_decrypt_cb (void *cls,
   {
     /* Expecting shadow record  but without shadow flag*/
     memset (rd_cmp_data, TEST_SHADOW_RECORD_DATA, TEST_RECORD_DATALEN);
-    GNUNET_assert (TEST_RECORD_TYPE == rd[0].record_type);
-    GNUNET_assert (TEST_RECORD_DATALEN == rd[0].data_size);
-    GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN));
-    GNUNET_assert (0 == (GNUNET_GNSRECORD_RF_SHADOW_RECORD & rd[0].flags));
+    if (TEST_RECORD_TYPE != rd[0].record_type)
+    {
+      GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+      GNUNET_break (0);
+      return;
+    }
+    if (TEST_RECORD_DATALEN != rd[0].data_size)
+    {
+      GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+      GNUNET_break (0);
+      return;
+    }
+    if (0 != memcmp (&rd_cmp_data, rd[0].data, TEST_RECORD_DATALEN))
+    {
+      GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+      GNUNET_break (0);
+      return;
+    }
+    if (0 != (GNUNET_GNSRECORD_RF_SHADOW_RECORD & rd[0].flags))
+    {
+      GNUNET_SCHEDULER_add_now (&endbadly, NULL);
+      GNUNET_break (0);
+      return;
+    }
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Block was decrypted successfully with former shadow record \n");
     GNUNET_SCHEDULER_add_now (&end, NULL );
@@ -240,7 +282,7 @@ put_cont (void *cls, int32_t success, const char *emsg)
   ncqe = GNUNET_NAMECACHE_lookup_block (nch, &derived_hash,
                                         &name_lookup_active_proc, &records[0]);
 
-  delayed_lookup_task = GNUNET_SCHEDULER_add_delayed (EXPIRATION, &name_lookup_shadow, NULL);
+  delayed_lookup_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (EXPIRATION, 2), &name_lookup_shadow, NULL);
 }
 
 
@@ -251,6 +293,10 @@ run (void *cls,
 {
   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,
@@ -304,7 +350,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;
 }