From 1e3d1148397da31088450c0b126c665a5214044e Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 30 Jun 2013 19:50:45 +0000
Subject: [PATCH] -fixing some namestore tests

---
 .../test_namestore_api_create_update.c          | 11 ++++++-----
 src/namestore/test_namestore_api_remove.c       | 17 +++++------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/namestore/test_namestore_api_create_update.c b/src/namestore/test_namestore_api_create_update.c
index 45a6b3870..28211d439 100644
--- a/src/namestore/test_namestore_api_create_update.c
+++ b/src/namestore/test_namestore_api_create_update.c
@@ -114,17 +114,17 @@ create_updated_cont (void *cls, int32_t success, const char *emsg)
 {
   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 @@ static void
 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, 
diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c
index 498b3a360..77edd3fa9 100644
--- a/src/namestore/test_namestore_api_remove.c
+++ b/src/namestore/test_namestore_api_remove.c
@@ -116,7 +116,6 @@ name_lookup_proc (void *cls,
 		  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 @@ name_lookup_proc (void *cls,
     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 @@ static void
 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;
-- 
2.25.1