-ensure stats queues do not grow too big

[oweals/gnunet.git] / src / datacache / test_datacache.c

diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c
index 1d8cd3295268a063fbb2ec1f66035a6993ff57b7..79e6b6d749612f92a3dd7404cedb76faafda6a1c 100644 (file)
--- a/src/datacache/test_datacache.c
+++ b/src/datacache/test_datacache.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2006, 2009, 2010 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2006, 2009, 2010 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /*
  * @file datacache/test_datacache.c
@@ -25,7 +25,7 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_datacache_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 
 #define ASSERT(x) do { if (! (x)) { printf("Error at %s:%d\n", __FILE__, __LINE__); goto FAILURE;} } while (0)
 
@@ -38,9 +38,13 @@ static const char *plugin_name;
 
 
 static int
-checkIt (void *cls, struct GNUNET_TIME_Absolute exp,
-         const struct GNUNET_HashCode * key, size_t size, const char *data,
-         enum GNUNET_BLOCK_Type type)
+checkIt (void *cls,
+         const struct GNUNET_HashCode *key,
+        size_t size, const char *data,
+         enum GNUNET_BLOCK_Type type,
+        struct GNUNET_TIME_Absolute exp,
+        unsigned int path_len,
+        const struct GNUNET_PeerIdentity *path)
 {
   if (size != sizeof (struct GNUNET_HashCode))
   {
@@ -71,19 +75,21 @@ run (void *cls, char *const *args, const char *cfgfile,
   if (h == NULL)
   {
     FPRINTF (stderr,
-             "%s", 
+             "%s",
             "Failed to initialize datacache.  Database likely not setup, skipping test.\n");
+    ok = 77; /* mark test as skipped */
     return;
   }
   exp = GNUNET_TIME_absolute_get ();
-  exp.abs_value += 5 * 60 * 1000;
+  exp.abs_value_us += 5 * 60 * 1000 * 1000LL;
   memset (&k, 0, sizeof (struct GNUNET_HashCode));
   for (i = 0; i < 100; i++)
   {
     GNUNET_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n);
     ASSERT (GNUNET_OK ==
             GNUNET_DATACACHE_put (h, &k, sizeof (struct GNUNET_HashCode),
-                                  (const char *) &n, 1 + i % 16, exp));
+                                  (const char *) &n, 1 + i % 16, exp,
+                                 0, NULL));
     k = n;
   }
   memset (&k, 0, sizeof (struct GNUNET_HashCode));
@@ -99,7 +105,8 @@ run (void *cls, char *const *args, const char *cfgfile,
   ASSERT (GNUNET_OK ==
           GNUNET_DATACACHE_put (h, &k, sizeof (struct GNUNET_HashCode),
                                 (const char *) &n, 792,
-                                GNUNET_TIME_UNIT_FOREVER_ABS));
+                                GNUNET_TIME_UNIT_FOREVER_ABS,
+                               0, NULL));
   ASSERT (0 != GNUNET_DATACACHE_get (h, &k, 792, &checkIt, &n));
 
   GNUNET_DATACACHE_destroy (h);
@@ -134,7 +141,7 @@ main (int argc, char *argv[])
                    plugin_name);
   GNUNET_PROGRAM_run ((sizeof (xargv) / sizeof (char *)) - 1, xargv,
                       "test-datacache", "nohelp", options, &run, NULL);
-  if (0 != ok)
+  if ( (0 != ok) && (77 != ok) )
     FPRINTF (stderr, "Missed some testcases: %d\n", ok);
   return ok;
 }