[GNUnet-SVN] r27694 - gnunet/src/namestore

[gnunet]

Author: grothoff
Date: 2013-06-30 21:50:45 +0200 (Sun, 30 Jun 2013)
New Revision: 27694

Modified:
   gnunet/src/namestore/test_namestore_api_create_update.c
   gnunet/src/namestore/test_namestore_api_remove.c
Log:
-fixing some namestore tests

Modified: gnunet/src/namestore/test_namestore_api_create_update.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_create_update.c     2013-06-30 
19:46:53 UTC (rev 27693)
+++ gnunet/src/namestore/test_namestore_api_create_update.c     2013-06-30 
19:50:45 UTC (rev 27694)
@@ -114,17 +114,17 @@
 {
   char *name = cls;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating expiration for record `%s': 
%s `%s'\n", name, ((success == GNUNET_YES) || (success == GNUNET_NO)) ? 
"SUCCESS" : "FAIL", emsg);
-  if (success == GNUNET_NO)
+  if (success == GNUNET_OK)
   {
     res = 0;
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updated record for name `%s'\n", 
name);
-  }
-  else if (success == GNUNET_OK)
+  } 
+  else if (success == GNUNET_NO)
   {
     res = 1;
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "FAIL, Create new record for name 
`%s'\n", name);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed updating record for name 
`%s'\n", name);
   }
-  else
+  else 
   {
     res = 1;
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to create records for name 
`%s'\n", name);
@@ -137,6 +137,7 @@
 create_identical_cont (void *cls, int32_t success, const char *emsg)
 {
   char *name = cls;
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
              "Updating identical record for `%s': %s `%s'\n", 
              name, 

Modified: gnunet/src/namestore/test_namestore_api_remove.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_remove.c    2013-06-30 19:46:53 UTC 
(rev 27693)
+++ gnunet/src/namestore/test_namestore_api_remove.c    2013-06-30 19:50:45 UTC 
(rev 27694)
@@ -116,7 +116,6 @@
                  const struct GNUNET_NAMESTORE_RecordData *rd,
                  const struct GNUNET_CRYPTO_EccSignature *signature)
 {
-  static int found = GNUNET_NO;
   int failed = GNUNET_NO;
 
   if (NULL != n)
@@ -147,16 +146,7 @@
     else
       res = 1;
   }
-  else
-  {
-    if (found != GNUNET_YES)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to lookup records for name 
`%s'\n", s_name);
-      res = 1;
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Lookup done for name %s'\n", s_name);
-  }
-  GNUNET_SCHEDULER_add_now(&end, NULL);
+  GNUNET_SCHEDULER_add_now (&end, NULL);
 }
 
 
@@ -164,7 +154,10 @@
 remove_cont (void *cls, int32_t success, const char *emsg)
 {
   char *name = cls;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Remove record for `%s': %s\n", name, 
(success == GNUNET_YES) ? "SUCCESS" : "FAIL", emsg);
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Remove record for `%s': %s\n", name, (success == GNUNET_YES) ? 
"SUCCESS" : "FAIL",
+             emsg);
   if (success == GNUNET_OK)
   {
     res = 0;