gpl3

[oweals/gnunet.git] / src / datastore / test_datastore_api.c

diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index 53e61d092ff8d96c0114bfd3260474e97729b45c..3093f7545a5181b6121680816b4d4f5e51ef1ba9 100644 (file)
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -89,7 +89,7 @@ get_expiration (int i)
 {
   struct GNUNET_TIME_Absolute av;
 
-  av.value = now.value + 200000 - i * 1000;
+  av.value = now.value + 20000000 - i * 1000;
   return av;
 }
 
@@ -109,7 +109,8 @@ enum RunPhase
     RP_GET_MULTIPLE_DONE,
     RP_UPDATE,
     RP_UPDATE_VALIDATE,
-    RP_UPDATE_DONE
+    RP_UPDATE_DONE,
+    RP_ERROR
   };
 
 
@@ -139,9 +140,13 @@ check_success (void *cls,
 {
   struct CpsRunContext *crc = cls;
   if (GNUNET_OK != success)
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-               "%s\n", msg);
-  GNUNET_assert (GNUNET_OK == success);
+    {
+      ok = 42;
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                 "%s\n", msg);
+      GNUNET_SCHEDULER_shutdown (crc->sched);
+      return;
+    }
   GNUNET_free_non_null (crc->data);
   crc->data = NULL;
   GNUNET_SCHEDULER_add_continuation (crc->sched,
@@ -221,7 +226,17 @@ delete_value (void *cls,
   struct CpsRunContext *crc = cls;
   if (key == NULL)
     {
-      crc->phase = RP_DO_DEL;
+      if (crc->data == NULL)
+       {
+         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                     "Content %u not found!\n",
+                     crc->i);
+         crc->phase = RP_ERROR;
+       }
+      else
+       {
+         crc->phase = RP_DO_DEL;
+       }
       GNUNET_SCHEDULER_add_continuation (crc->sched,
                                         &run_continuation,
                                         crc,
@@ -276,15 +291,40 @@ check_multiple (void *cls,
 
   if (key == NULL)
     {
-      GNUNET_assert (crc->phase == RP_GET_MULTIPLE_DONE);
-      crc->phase = RP_UPDATE;
+      if (crc->phase != RP_GET_MULTIPLE_DONE)
+       {
+         GNUNET_break (0);
+         crc->phase = RP_ERROR;
+       }
+      else
+       {
+         crc->phase = RP_UPDATE;
+       }
       GNUNET_SCHEDULER_add_continuation (crc->sched,
                                         &run_continuation,
                                         crc,
                                         GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       return;
     }
-  crc->phase++;
+  switch (crc->phase)
+    {
+    case RP_GET_MULTIPLE:
+      crc->phase = RP_GET_MULTIPLE_NEXT;
+      break;
+    case RP_GET_MULTIPLE_NEXT:
+      crc->phase = RP_GET_MULTIPLE_DONE;
+      break;
+    case RP_GET_MULTIPLE_DONE:
+      /* do not advance further */
+      break;
+    default:
+      GNUNET_break (0);
+      break;
+    }
+#if VERBOSE
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Test in phase %u\n", crc->phase);
+#endif
   if (priority == get_priority (42))
     crc->uid = uid;
   GNUNET_DATASTORE_get_next (datastore, GNUNET_YES);
@@ -386,6 +426,7 @@ run_continuation (void *cls,
                  "DEL",
                  crc->i);
 #endif
+      crc->data = NULL;
       GNUNET_CRYPTO_hash (&crc->i, sizeof (int), &crc->key);
       GNUNET_DATASTORE_get (datastore, 
                            &crc->key,
@@ -515,6 +556,12 @@ run_continuation (void *cls,
       GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
       GNUNET_free (crc);
       ok = 0;
+      break;
+    case RP_ERROR:
+      GNUNET_DATASTORE_disconnect (datastore, GNUNET_YES);
+      GNUNET_free (crc);
+      ok = 43;
+      break;
     }
 }