- next test

2 files changed, 81 insertions, 165 deletions

diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 299b64fdc..59bd1191a 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -214,13 +214,13 @@ test_gns_pseu_shorten_LDADD = \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/dht/libgnunetdht.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_DEPENDENCIES = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/dht/libgnunetdht.la \
   $(top_builddir)/src/gns/libgnunetgns.la \
-  $(top_builddir)/src/testing_old/libgnunettesting_old.la
+  $(top_builddir)/src/testing/libgnunettesting.la
 
 
 test_gns_max_queries_SOURCES = \
diff --git a/src/gns/test_gns_pseu_shorten.c b/src/gns/test_gns_pseu_shorten.c
index f3a3c59a2..12e7adc2f 100644
--- a/src/gns/test_gns_pseu_shorten.c
+++ b/src/gns/test_gns_pseu_shorten.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_gns.h"
 #include "gnunet_signatures.h"
@@ -63,18 +63,9 @@
 
 /* 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 */
 static GNUNET_SCHEDULER_TaskIdentifier die_task;
 
-static GNUNET_SCHEDULER_TaskIdentifier disco_task;
-
 /* Global return value (0 for success, anything else for failure) */
 static int ok;
 
@@ -102,36 +93,44 @@ struct GNUNET_CRYPTO_ShortHashCode our_zone;
 struct GNUNET_CRYPTO_ShortHashCode priv_zone;
 struct GNUNET_CRYPTO_ShortHashCode short_zone;
 
+
 /**
- * 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.
  */
-void
-shutdown_callback (void *cls, const char *emsg)
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  if (disco_task != GNUNET_SCHEDULER_NO_TASK)
+  die_task = GNUNET_SCHEDULER_NO_TASK;
+  if (NULL != gns_handle)
   {
-    disco_task = GNUNET_SCHEDULER_NO_TASK;
-    GNUNET_SCHEDULER_cancel(disco_task);
-    GNUNET_DHT_disconnect(dht_handle);
-    dht_handle = NULL;
+    GNUNET_GNS_disconnect(gns_handle);
+    gns_handle = NULL;
   }
 
-  if (emsg != 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);
+  if (NULL != dht_handle)
+  {
+    GNUNET_DHT_disconnect (dht_handle);
+    dht_handle = NULL;
+  }
+
+  GNUNET_break (0);
+  GNUNET_SCHEDULER_shutdown ();
+  ok = 1;
 }
 
 static void
-disco_dht(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+end_badly_now ()
 {
-  disco_task = GNUNET_SCHEDULER_NO_TASK;
-  GNUNET_DHT_disconnect(dht_handle);
-  dht_handle = NULL;
+  GNUNET_SCHEDULER_cancel (die_task);
+  die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
 }
 
 /**
@@ -140,9 +139,24 @@ disco_dht(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 static void
 process_shorten_result(void* cls, const char* sname)
 {
-  GNUNET_GNS_disconnect(gns_handle);
-  //GNUNET_SCHEDULER_add_now(disco_dht, NULL);
-  ok = 0;
+
+  if (GNUNET_SCHEDULER_NO_TASK != die_task)
+  {
+      GNUNET_SCHEDULER_cancel (die_task);
+      die_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+
+  if (NULL != gns_handle)
+  {
+    GNUNET_GNS_disconnect(gns_handle);
+    gns_handle = NULL;
+  }
+
+  if (NULL != dht_handle)
+  {
+    GNUNET_DHT_disconnect (dht_handle);
+    dht_handle = NULL;
+  }
 
   if (sname == NULL)
   {
@@ -164,21 +178,10 @@ process_shorten_result(void* cls, const char* sname)
 
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "shorten test succeeded!\n");
   }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer1!\n");
-  GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n");
+  GNUNET_SCHEDULER_shutdown ();
 }
 
-static void
-do_shorten(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_GNS_shorten_zone (gns_handle, TEST_DOMAIN,
-                           &priv_zone,
-                           &short_zone,
-                           &our_zone,
-                           &process_shorten_result,
-                           TEST_DOMAIN);
-}
 
 static void
 on_lookup_result(void *cls, uint32_t rd_count,
@@ -219,8 +222,12 @@ on_lookup_result(void *cls, uint32_t rd_count,
       }
     }
   }
-  
-  GNUNET_SCHEDULER_add_delayed (TIMEOUT, &do_shorten, NULL);
+  GNUNET_GNS_shorten_zone (gns_handle, TEST_DOMAIN,
+                           &priv_zone,
+                           &short_zone,
+                           &our_zone,
+                           &process_shorten_result,
+                           TEST_DOMAIN);
 }
 
 
@@ -231,16 +238,15 @@ on_lookup_result(void *cls, uint32_t rd_count,
 static void
 commence_testing (void *cls, int success)
 {
-  GNUNET_SCHEDULER_add_now(disco_dht, NULL);
-  //GNUNET_DHT_disconnect(dht_handle);
 
   GNUNET_CRYPTO_rsa_key_free(our_key);
   GNUNET_CRYPTO_rsa_key_free(bob_key);
   GNUNET_CRYPTO_rsa_key_free(alice_key);
 
   GNUNET_NAMESTORE_disconnect (namestore_handle);
-  gns_handle = GNUNET_GNS_connect(cfg);
+  namestore_handle = NULL;
 
+  gns_handle = GNUNET_GNS_connect(cfg);
   if (NULL == gns_handle)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -255,28 +261,6 @@ commence_testing (void *cls, int success)
                           &on_lookup_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 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test with error: `%s'!\n",
-              (char *) cls);
-  ok = 1;
-  
-  if (disco_task != GNUNET_SCHEDULER_NO_TASK)
-  {
-    disco_task = GNUNET_SCHEDULER_NO_TASK;
-    GNUNET_SCHEDULER_cancel(disco_task);
-    GNUNET_DHT_disconnect(dht_handle);
-    dht_handle = NULL;
-  }
-  if (pg != NULL)
-    GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
-  GNUNET_SCHEDULER_cancel (die_task);
-}
 
 static void
 put_pseu_dht(void *cls, int success)
@@ -330,14 +314,12 @@ put_pseu_dht(void *cls, int success)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
     ok = 3;
-    GNUNET_DHT_disconnect(dht_handle);
-    
-    
     GNUNET_CRYPTO_rsa_key_free(our_key);
     GNUNET_CRYPTO_rsa_key_free(bob_key);
     GNUNET_CRYPTO_rsa_key_free(alice_key);
     GNUNET_free(sig);
     GNUNET_free (nrb);
+    end_badly_now ();
     return;
   }
   GNUNET_CRYPTO_short_hash("+", strlen("+"), &name_hash);
@@ -419,13 +401,13 @@ put_www_dht(void *cls, int success)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
     ok = 3;
-    GNUNET_DHT_disconnect(dht_handle);
-    
     GNUNET_CRYPTO_rsa_key_free(our_key);
     GNUNET_CRYPTO_rsa_key_free(bob_key);
     GNUNET_CRYPTO_rsa_key_free(alice_key);
+    GNUNET_free (sig);
     GNUNET_free(web);
     GNUNET_free (nrb);
+    end_badly_now();
     return;
   }
   GNUNET_CRYPTO_short_hash(TEST_RECORD_NAME, strlen(TEST_RECORD_NAME), &name_hash);
@@ -449,8 +431,8 @@ put_www_dht(void *cls, int success)
                   DHT_OPERATION_TIMEOUT,
                   &put_pseu_dht,
                   NULL);
-
-  GNUNET_free(web);
+  GNUNET_free (sig);
+  GNUNET_free (web);
   GNUNET_free (nrb);
 }
 
@@ -500,11 +482,12 @@ put_pkey_dht(void *cls, int32_t success, const char *emsg)
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n");
     ok = 3;
     
-    GNUNET_CRYPTO_rsa_key_free(our_key);
-    GNUNET_CRYPTO_rsa_key_free(bob_key);
-    GNUNET_CRYPTO_rsa_key_free(alice_key);
-    GNUNET_free(sig);
+    GNUNET_CRYPTO_rsa_key_free (our_key);
+    GNUNET_CRYPTO_rsa_key_free (bob_key);
+    GNUNET_CRYPTO_rsa_key_free (alice_key);
+    GNUNET_free (sig);
     GNUNET_free (nrb);
+    end_badly_now ();
     return;
   }
 
@@ -530,6 +513,7 @@ put_pkey_dht(void *cls, int32_t success, const char *emsg)
                   DHT_OPERATION_TIMEOUT,
                   &put_www_dht,
                   NULL);
+  GNUNET_free (sig);
   GNUNET_free (nrb);
 }
 
@@ -572,25 +556,23 @@ cont_init_zone (void *cls, int32_t success, const char *emsg)
 }
 
 static void
-do_lookup (void *cls, const struct GNUNET_PeerIdentity *id,
-           const struct GNUNET_CONFIGURATION_Handle *_cfg,
-           struct GNUNET_TESTING_Daemon *d, const char *emsg)
+do_check (void *cls,
+          const struct GNUNET_CONFIGURATION_Handle *ccfg,
+          struct GNUNET_TESTING_Peer *peer)
 {
-  
   char* private_keyfile;
   char* shorten_keyfile;
   char* our_keyfile;
   
-  cfg = _cfg;
-
-  GNUNET_SCHEDULER_cancel (die_task);
+  cfg = ccfg;
+  die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
 
   /* 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;
   }
   
@@ -599,7 +581,7 @@ do_lookup (void *cls, const struct GNUNET_PeerIdentity *id,
   if (NULL == dht_handle)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to dht\n");
-    ok = -1;
+    end_badly_now();
     return;
   }
 
@@ -608,7 +590,7 @@ do_lookup (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;
   }
   
@@ -618,7 +600,7 @@ do_lookup (void *cls, const struct GNUNET_PeerIdentity *id,
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
                "Failed to get shorten zone key from cfg\n");
-    ok = -1;
+    end_badly_now();
     return;
   }
   
@@ -628,7 +610,7 @@ do_lookup (void *cls, const struct GNUNET_PeerIdentity *id,
   {
     GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
                "Failed to get private zone key from cfg\n");
-    ok = -1;
+    end_badly_now();
     return;
   }
   our_key = GNUNET_CRYPTO_rsa_key_create_from_file (our_keyfile);
@@ -665,74 +647,12 @@ do_lookup (void *cls, const struct GNUNET_PeerIdentity *id,
                                   &rd,
                                   &cont_init_zone,
                                   NULL);
-
-
-
-
-}
-
-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 */
-  //d1 = GNUNET_TESTING_daemon_start(cfg, TIMEOUT, GNUNET_NO, NULL, NULL, 0,
-  //                                 NULL, NULL, NULL, &do_lookup, NULL);
-  pg = GNUNET_TESTING_daemons_start(cfg, 1, 1, 1, TIMEOUT,
-                                    NULL, NULL, &do_lookup, NULL,
-                                    NULL, NULL, NULL);
-}
-
-static int
-check ()
-{
-  int ret;
-
-  /* Arguments for GNUNET_PROGRAM_run */
-  char *const argv[] = { "test-gns-pseu-shorten", /* 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-pseu-shorten", "nohelp", options, &run,
-                          &ok);
-  if (ret != GNUNET_OK)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "`test-gns-pseu-shorten': Failed with error code %d\n", ret);
-  }
-  return ok;
 }
 
 int
 main (int argc, char *argv[])
 {
-  int ret;
+  ok = 1;
 
   GNUNET_log_setup ("test-gns-pseu-shorten",
 #if VERBOSE
@@ -741,12 +661,8 @@ main (int argc, char *argv[])
                     "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-pseu-shorten", "test_gns_simple_lookup.conf", &do_check, NULL);
+  return ok;
 }
 
-/* end of test_gns_twopeer.c */
+/* end of test_gns_pseu_shorten.c */