test

3 files changed, 72 insertions, 137 deletions

diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 7b88769fb..f5c2771b7 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -199,12 +199,12 @@ test_gns_simple_get_authority_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/testing_old/libgnunettesting_old.la
+  $(top_builddir)/src/testing/libgnunettesting.la
 test_gns_simple_get_authority_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/testing_old/libgnunettesting_old.la
+  $(top_builddir)/src/testing/libgnunettesting.la
 
 
 test_gns_pseu_shorten_SOURCES = \
diff --git a/src/gns/test_gns_simple_get_authority.c b/src/gns/test_gns_simple_get_authority.c
index 6a8184efd..867cb8de6 100644
--- a/src/gns/test_gns_simple_get_authority.c
+++ b/src/gns/test_gns_simple_get_authority.c
@@ -23,7 +23,7 @@
  *
  */
 #include "platform.h"
-#include "gnunet_testing_lib.h"
+#include "gnunet_testing_lib-new.h"
 #include "gnunet_core_service.h"
 #include "block_dns.h"
 #include "gnunet_signatures.h"
@@ -56,13 +56,6 @@
 
 /* Globals */
 
-/**
- * Directory to store temp data in, defined in config file
- */
-static char *test_directory;
-
-static struct GNUNET_TESTING_PeerGroup *pg;
-
 /* Task handle to use to schedule test failure */
 GNUNET_SCHEDULER_TaskIdentifier die_task;
 
@@ -75,35 +68,56 @@ static struct GNUNET_GNS_Handle *gns_handle;
 
 const struct GNUNET_CONFIGURATION_Handle *cfg;
 
+
 /**
- * Check whether peers successfully shut down.
+ * Check if the get_handle is being used, if so stop the request.  Either
+ * way, schedule the end_badly_cont function which actually shuts down the
+ * test.
  */
 static void
-shutdown_callback (void *cls, const char *emsg)
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_SCHEDULER_shutdown ();
+  ok = 1;
+}
+
+void end_badly_now ()
 {
-  if (emsg != NULL)
+  if (NULL != gns_handle)
+  {
+    GNUNET_GNS_disconnect(gns_handle);
+    gns_handle = NULL;
+  }
+
+  if (NULL != namestore_handle)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error on shutdown! ret=%d\n", ok);
-    if (ok == 0)
-      ok = 2;
+    GNUNET_NAMESTORE_disconnect (namestore_handle);
+    namestore_handle = NULL;
   }
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "done(ret=%d)!\n", ok);
+  GNUNET_SCHEDULER_cancel (die_task);
+  die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
 }
 
+
 /**
  * Called when gns_get_authority finishes
  */
 static void
 process_auth_result(void* cls, const char* aname)
 {
-  GNUNET_GNS_disconnect(gns_handle);
 
+  GNUNET_GNS_disconnect(gns_handle);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "disconnecting from namestore\n");
+              "Disconnecting from namestore\n");
   GNUNET_NAMESTORE_disconnect (namestore_handle);
-  ok = 0;
+
+  if (GNUNET_SCHEDULER_NO_TASK != die_task)
+  {
+      GNUNET_SCHEDULER_cancel (die_task);
+      die_task = GNUNET_SCHEDULER_NO_TASK;
+  }
 
   if (aname == NULL)
   {
@@ -122,15 +136,20 @@ process_auth_result(void* cls, const char* aname)
                   TEST_EXPECTED_RESULT, aname);
       ok = 1;
     }
+    else
+    {
+      ok = 0;
+    }
 
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "get_authority test finished!\n");
 
   }
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer1!\n");
-  GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+  GNUNET_SCHEDULER_shutdown ();
 }
 
+
 /**
  * Function scheduled to be run on the successful start of services
  * tries to shorten the name TEST_DOMAIN using gns
@@ -138,57 +157,27 @@ process_auth_result(void* cls, const char* aname)
 static void
 commence_testing (void *cls, int32_t success, const char *emsg)
 {
-  
-  
-  
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "connecting to gns\n");
+              "Connecting to gns\n");
   gns_handle = GNUNET_GNS_connect(cfg);
-
   if (NULL == gns_handle)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "failed to connect to gns\n");
-    ok = 1;
+                "Failed to connect to gns\n");
+    end_badly_now();
     return;
   }
 
   GNUNET_GNS_get_authority(gns_handle, TEST_DOMAIN, &process_auth_result,
                      TEST_DOMAIN);
-  
 }
 
-/**
- * Continuation for the GNUNET_DHT_get_stop call, so that we don't shut
- * down the peers without freeing memory associated with GET request.
- */
-static void
-end_badly_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
 
-  if (pg != NULL)
-    GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
-  GNUNET_SCHEDULER_cancel (die_task);
-}
 
-/**
- * Check if the get_handle is being used, if so stop the request.  Either
- * way, schedule the end_badly_cont function which actually shuts down the
- * test.
- */
-static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test with error: `%s'!\n",
-              (char *) cls);
-  GNUNET_SCHEDULER_add_now (&end_badly_cont, NULL);
-  ok = 1;
-}
-
-static void
-do_shorten(void *cls, const struct GNUNET_PeerIdentity *id,
-          const struct GNUNET_CONFIGURATION_Handle *_cfg,
-          struct GNUNET_TESTING_Daemon *d, const char *emsg)
+void do_check (void *cls,
+              const struct GNUNET_CONFIGURATION_Handle *ccfg,
+              struct GNUNET_TESTING_Peer *peer)
 {
   struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded our_pkey;
   struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey;
@@ -201,16 +190,16 @@ do_shorten(void *cls, const struct GNUNET_PeerIdentity *id,
   struct GNUNET_CRYPTO_RsaSignature *sig;
   char* our_keyfile;
 
-  cfg = _cfg;
-
-  GNUNET_SCHEDULER_cancel (die_task);
+  cfg = ccfg;
+  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Running test\n");
 
   /* put records into namestore */
   namestore_handle = GNUNET_NAMESTORE_connect(cfg);
   if (NULL == namestore_handle)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
-    ok = -1;
+    end_badly_now();
     return;
   }
 
@@ -219,7 +208,7 @@ do_shorten(void *cls, const struct GNUNET_PeerIdentity *id,
                                                           &our_keyfile))
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n");
-    ok = -1;
+    end_badly_now();
     return;
   }
 
@@ -228,24 +217,24 @@ do_shorten(void *cls, const struct GNUNET_PeerIdentity *id,
 
   bob_key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE_BOB);
   alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE_ALICE);
-  
+
   GNUNET_CRYPTO_rsa_key_get_public (our_key, &our_pkey);
   GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey);
   GNUNET_CRYPTO_rsa_key_get_public (bob_key, &bob_pkey);
 
   struct GNUNET_NAMESTORE_RecordData rd;
   char* ip = TEST_IP;
-  struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
+  struct in_addr *web = GNUNET_malloc (sizeof(struct in_addr));
   rd.expiration_time = UINT64_MAX;
-  GNUNET_assert(1 == inet_pton (AF_INET, ip, web));
-  
+  GNUNET_assert (1 == inet_pton (AF_INET, ip, web));
+
   GNUNET_CRYPTO_short_hash(&bob_pkey, sizeof(bob_pkey), &bob_hash);
 
   rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = &bob_hash;
   rd.record_type = GNUNET_GNS_RECORD_PKEY;
   rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
-  
+
   /* put bob into our zone */
   GNUNET_NAMESTORE_record_create (namestore_handle,
                                   our_key,
@@ -253,7 +242,7 @@ do_shorten(void *cls, const struct GNUNET_PeerIdentity *id,
                                   &rd,
                                   NULL,
                                   NULL);
-  
+
   /* put alice into bobs zone */
   GNUNET_CRYPTO_short_hash(&alice_pkey, sizeof(alice_pkey), &alice_hash);
   rd.data = &alice_hash;
@@ -270,6 +259,8 @@ do_shorten(void *cls, const struct GNUNET_PeerIdentity *id,
                                NULL,
                                NULL);
 
+  GNUNET_free (sig);
+
   /* put www A record and PSEU into alice's zone */
 
   rd.data_size = sizeof(struct in_addr);
@@ -306,86 +297,30 @@ do_shorten(void *cls, const struct GNUNET_PeerIdentity *id,
                                &commence_testing,
                                NULL);
 
-  GNUNET_free(sig);
+  GNUNET_free (web);
+  GNUNET_free (sig);
   GNUNET_CRYPTO_rsa_key_free (alice_key);
   GNUNET_CRYPTO_rsa_key_free (bob_key);
   GNUNET_CRYPTO_rsa_key_free (our_key);
 }
 
-static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *c)
-{
-  cfg = c;
-   /* Get path from configuration file */
-  if (GNUNET_YES !=
-      GNUNET_CONFIGURATION_get_value_string (cfg, "paths", "servicehome",
-                                             &test_directory))
-  {
-    ok = 404;
-    return;
-  }
-
-    
-  /* Set up a task to end testing if peer start fails */
-  die_task =
-      GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly,
-                                    "didn't start all daemons in reasonable amount of time!!!");
-  
-  /* Start alice */
-  pg = GNUNET_TESTING_daemons_start(cfg, 1, 1, 1, TIMEOUT,
-                                    NULL, NULL, &do_shorten, NULL,
-                                    NULL, NULL, NULL);
-}
-
-static int
-check ()
-{
-  int ret;
-
-  /* Arguments for GNUNET_PROGRAM_run */
-  char *const argv[] = { "test-gns-simple-get-authority", /* Name to give running binary */
-    "-c",
-    "test_gns_simple_lookup.conf",       /* Config file to use */
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
-    NULL
-  };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  /* Run the run function as a new program */
-  ret =
-      GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
-                          "test-gns-simple-get-authority", "nohelp", options, &run,
-                          &ok);
-  if (ret != GNUNET_OK)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "`test-gns-simple-get-authority': Failed with error code %d\n", ret);
-  }
-  return ok;
-}
-
 int
 main (int argc, char *argv[])
 {
-  int ret;
+  ok = 1;
 
-  GNUNET_log_setup ("test-gns-simple-lookup",
+  GNUNET_log_setup ("test-gns-simple-get-authority",
 #if VERBOSE
                     "DEBUG",
 #else
                     "WARNING",
 #endif
                     NULL);
-  ret = check ();
-  /**
-   * Need to remove base directory, subdirectories taken care
-   * of by the testing framework.
-   */
-  return ret;
+
+  GNUNET_TESTING_peer_run ("test-gns-simple-get-authority", "test_gns_simple_lookup.conf", &do_check, NULL);
+
+  return ok;
 }
 
-/* end of test_gns_twopeer.c */
+/* end of test-gns-simple-get-authority.c */
+
diff --git a/src/gns/test_gns_simple_shorten.c b/src/gns/test_gns_simple_shorten.c
index e8433d274..e8612520d 100644
--- a/src/gns/test_gns_simple_shorten.c
+++ b/src/gns/test_gns_simple_shorten.c
@@ -153,7 +153,7 @@ commence_testing (void *cls, int32_t success, const char *emsg)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Failed to connect to gns\n");
-    ok = 1;
+    end_badly_now ();
     return;
   }
 
@@ -344,4 +344,4 @@ main (int argc, char *argv[])
   return ok;
 }
 
-/* end of test_gns_simple_shorten.c */
+/* end of test_gns_twopeer.c */