[GNUnet-SVN] r13951 - gnunet/src/testing

[gnunet]

Author: grothoff
Date: 2010-12-20 22:55:01 +0100 (Mon, 20 Dec 2010)
New Revision: 13951

Added:
   gnunet/src/testing/test_testing_reconnect.c
Modified:
   gnunet/src/testing/Makefile.am
Log:
reconnect via testing testcase

Modified: gnunet/src/testing/Makefile.am
===================================================================
--- gnunet/src/testing/Makefile.am      2010-12-20 20:24:17 UTC (rev 13950)
+++ gnunet/src/testing/Makefile.am      2010-12-20 21:55:01 UTC (rev 13951)
@@ -20,12 +20,11 @@
  $(top_builddir)/src/transport/libgnunettransport.la \
  -lm \
  $(top_builddir)/src/util/libgnunetutil.la 
- 
-#noinst_PROGRAMS = ${check_PROGRAMS}
 
 check_PROGRAMS = \
  test_testing \
  test_testing_connect \
+ test_testing_reconnect \
  test_testing_group \
  test_testing_topology_stability \
  test_testing_topology_clique \
@@ -49,6 +48,7 @@
 TESTS = \
  test_testing \
  test_testing_connect \
+ test_testing_reconnect \
  test_testing_group \
  test_testing_topology_clique
 # test_testing_topology_stability \
@@ -80,36 +80,42 @@
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+test_testing_reconnect_SOURCES = \
+ test_testing_reconnect.c
+test_testing_reconnect_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
 test_testing_group_SOURCES = \
  test_testing_group.c
 test_testing_group_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la  
- 
+
 test_testing_topology_clique_SOURCES = \
  test_testing_topology.c
 test_testing_topology_clique_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 test_testing_topology_stability_SOURCES = \
  test_testing_topology.c
 test_testing_topology_stability_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 test_testing_topology_blacklist_SOURCES = \
  test_testing_topology_blacklist.c
 test_testing_topology_blacklist_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la 
- 
+
 test_testing_topology_churn_SOURCES = \
  test_testing_topology_churn.c
 test_testing_topology_churn_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la 
- 
+
 test_testing_topology_clique_random_SOURCES = \
  test_testing_topology.c
 test_testing_topology_clique_random_LDADD = \
@@ -121,7 +127,7 @@
 test_testing_topology_clique_minimum_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 test_testing_topology_clique_dfs_SOURCES = \
  test_testing_topology.c
 test_testing_topology_clique_dfs_LDADD = \
@@ -133,8 +139,8 @@
 test_testing_topology_line_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la  
-   
 
+
 test_testing_group_remote_SOURCES = \
  test_testing_group_remote.c
 test_testing_group_remote_LDADD = \
@@ -146,25 +152,25 @@
 test_testing_topology_ring_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la  
- 
+
 test_testing_topology_2d_torus_SOURCES = \
   test_testing_topology.c
 test_testing_topology_2d_torus_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la 
- 
+
 test_testing_topology_small_world_ring_SOURCES = \
   test_testing_topology.c
 test_testing_topology_small_world_ring_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 test_testing_topology_small_world_torus_SOURCES = \
   test_testing_topology.c
 test_testing_topology_small_world_torus_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 test_testing_topology_internat_SOURCES = \
   test_testing_topology.c
 test_testing_topology_internat_LDADD = \
@@ -176,7 +182,7 @@
 test_testing_topology_erdos_renyi_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 test_testing_topology_scale_free_SOURCES = \
   test_testing_topology.c
 test_testing_topology_scale_free_LDADD = \
@@ -188,8 +194,8 @@
 test_testing_topology_none_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
- 
+
+
 EXTRA_DIST = \
  test_testing_data.conf \
  test_testing_connect_peer1.conf \
@@ -208,4 +214,4 @@
  test_testing_data_topology_blacklist.conf \
  test_testing_data_topology_churn.conf \
  test_testing_data_topology_none.conf
- 
+

Added: gnunet/src/testing/test_testing_reconnect.c
===================================================================
--- gnunet/src/testing/test_testing_reconnect.c                         (rev 0)
+++ gnunet/src/testing/test_testing_reconnect.c 2010-12-20 21:55:01 UTC (rev 
13951)
@@ -0,0 +1,234 @@
+/*
+     This file is part of GNUnet.
+     (C) 2010 Christian Grothoff (and other contributing authors)
+
+     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 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file testing/test_testing_reconnect.c
+ * @brief testcase for functions to connect two peers in testing.c
+ */
+#include "platform.h"
+#include "gnunet_testing_lib.h"
+
+#define VERBOSE GNUNET_NO
+
+/**
+ * How long until we give up on connecting the peers?
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
+
+#define CONNECT_ATTEMPTS 3
+
+static int ok;
+
+static struct GNUNET_TESTING_Daemon *d1;
+
+static struct GNUNET_TESTING_Daemon *d2;
+
+static struct GNUNET_CONFIGURATION_Handle *c1;
+
+static struct GNUNET_CONFIGURATION_Handle *c2;
+
+/**
+ * How many start-connect-stop iterations should we do?
+ */
+#define NUM_PHASES 2
+
+static int phase;
+
+/**
+ * Run the next phase of starting daemons, connecting them and
+ * stopping them again.
+ */
+static void 
+run_phase ();
+
+static void
+end2_cb (void *cls, const char *emsg)
+{
+
+  if (emsg != NULL)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Ending with error: %s\n", emsg);
+      ok = 1;
+    }
+  else
+    {
+      if (phase < NUM_PHASES)
+       {
+         fprintf (stderr, ".");
+         run_phase();
+         return;
+       }
+      fprintf (stderr, ".\n");
+#if VERBOSE
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Both daemons terminated, will now exit.\n");
+#endif
+      ok = 0;
+    }
+}
+
+static void
+end1_cb (void *cls, const char *emsg)
+{
+  if (emsg != NULL)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Stopping daemon 1 gave: %s\n",
+                  emsg);
+      ok = 1;
+    }
+  else
+    {
+      ok = 0;
+    }
+
+  GNUNET_TESTING_daemon_stop (d2, TIMEOUT, &end2_cb, NULL,
+                             (phase == NUM_PHASES) ? GNUNET_YES : GNUNET_NO,
+                              GNUNET_NO);
+  d2 = NULL;
+}
+
+static void
+finish_testing (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_TESTING_daemon_stop (d1, TIMEOUT, &end1_cb, NULL, 
+                             (phase == NUM_PHASES) ? GNUNET_YES : GNUNET_NO,
+                              GNUNET_NO);
+  d1 = NULL;
+}
+
+
+static void
+my_connect_complete (void *cls,
+                     const struct GNUNET_PeerIdentity *first,
+                     const struct GNUNET_PeerIdentity *second,
+                     unsigned int distance,
+                     const struct GNUNET_CONFIGURATION_Handle *first_cfg,
+                     const struct GNUNET_CONFIGURATION_Handle *second_cfg,
+                     struct GNUNET_TESTING_Daemon *first_daemon,
+                     struct GNUNET_TESTING_Daemon *second_daemon,
+                     const char *emsg)
+{
+#if VERBOSE
+  fprintf (stderr, "Peer %s ", GNUNET_i2s (first));
+  fprintf (stderr, "connected to %s\n", GNUNET_i2s (second));
+#endif
+  GNUNET_SCHEDULER_add_now (&finish_testing, NULL);
+}
+
+
+
+
+static void
+my_cb2 (void *cls,
+        const struct GNUNET_PeerIdentity *id,
+        const struct GNUNET_CONFIGURATION_Handle *cfg,
+        struct GNUNET_TESTING_Daemon *d, const char *emsg)
+{
+  GNUNET_assert (id != NULL);
+#if VERBOSE
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Daemon `%s' started.\n", GNUNET_i2s (id));
+#endif
+  GNUNET_TESTING_daemons_connect (d1, d2,
+                                  TIMEOUT, CONNECT_ATTEMPTS,
+                                  &my_connect_complete, NULL);
+}
+
+
+static void
+my_cb1 (void *cls,
+        const struct GNUNET_PeerIdentity *id,
+        const struct GNUNET_CONFIGURATION_Handle *cfg,
+        struct GNUNET_TESTING_Daemon *d, const char *emsg)
+{
+  GNUNET_assert (id != NULL);
+#if VERBOSE
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Daemon `%s' started.\n", GNUNET_i2s (id));
+#endif
+  d2 =
+    GNUNET_TESTING_daemon_start (c2, TIMEOUT, NULL, NULL, 0, NULL, NULL,
+                                 &my_cb2, NULL);
+  GNUNET_assert (d2 != NULL);
+}
+
+
+static void
+run (void *cls,
+     char *const *args,
+     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  ok = 1;
+#if VERBOSE
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemon.\n");
+#endif
+  c1 = GNUNET_CONFIGURATION_create ();
+  GNUNET_CONFIGURATION_parse (c1, "test_testing_connect_peer1.conf");
+  c2 = GNUNET_CONFIGURATION_create ();
+  GNUNET_CONFIGURATION_parse (c2, "test_testing_connect_peer2.conf");
+  run_phase ();
+}
+
+static void 
+run_phase ()
+{
+  phase++;
+  d1 =
+    GNUNET_TESTING_daemon_start (c1, TIMEOUT, NULL, NULL, 0, NULL, NULL,
+                                 &my_cb1, NULL);
+  GNUNET_assert (d1 != NULL);
+}
+
+static int
+check ()
+{
+  char *const argv[] = { "test-testing-reconnect",
+    "-c",
+    "test_testing_data.conf",
+#if VERBOSE
+    "-L", "DEBUG",
+#endif
+    NULL
+  };
+  struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+  GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
+                      argv, "test-testing-reconnect", "nohelp",
+                      options, &run, &ok);
+  return ok;
+}
+
+int
+main (int argc, char *argv[])
+{
+  int ret;
+
+  GNUNET_log_setup ("test-testing-reconnect",
+#if VERBOSE
+                    "DEBUG",
+#else
+                    "WARNING",
+#endif
+                    NULL);
+  ret = check ();
+  return ret;
+}
+
+/* end of test_testing_reconnect.c */