backup errno

[oweals/gnunet.git] / src / testing / test_testing_connect.c

diff --git a/src/testing/test_testing_connect.c b/src/testing/test_testing_connect.c
index c243cb1d73392db4d3e79125cce2c3e7396b7a59..e212a81b552b6b9f98d8a119eff54932b2ad90a3 100644 (file)
--- a/src/testing/test_testing_connect.c
+++ b/src/testing/test_testing_connect.c
@@ -4,7 +4,7 @@
 
      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 2, or (at your
+     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
@@ -26,12 +26,12 @@
 
 #define VERBOSE GNUNET_NO
 
-
 /**
  * How long until we give up on connecting the peers?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
 
+#define CONNECT_ATTEMPTS 3
 
 static int ok;
 
@@ -45,71 +45,92 @@ static struct GNUNET_CONFIGURATION_Handle *c2;
 
 static struct GNUNET_SCHEDULER_Handle *sched;
 
-static void end2_cb(void *cls,
-                  const char *emsg)
+static void
+end2_cb (void *cls, const char *emsg)
 {
-  GNUNET_assert (emsg == NULL); 
+
+  if (emsg != NULL)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Ending with error: %s\n", emsg);
+      ok = 1;
+    }
+  else
+    {
 #if VERBOSE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Both daemons terminated, will now exit.\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Both daemons terminated, will now exit.\n");
 #endif
- ok = 0;
+      ok = 0;
+    }
 }
 
-static void end1_cb(void *cls,
-                   const char *emsg)
+static void
+end1_cb (void *cls, const char *emsg)
 {
-  GNUNET_assert (emsg == NULL); 
-  GNUNET_TESTING_daemon_stop (d2, &end2_cb, NULL);
+  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, GNUNET_YES, 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, GNUNET_YES, GNUNET_NO);
+  d1 = NULL;
+}
 
 static void
 my_connect_complete (void *cls,
-                    const char *emsg)
+                     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)
 {
-  GNUNET_TESTING_daemon_stop (d1, &end1_cb, NULL);
-  d1 = NULL;
+  GNUNET_SCHEDULER_add_now (sched, &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)
+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));
+              "Daemon `%s' started.\n", GNUNET_i2s (id));
 #endif
   GNUNET_TESTING_daemons_connect (d1, d2,
-                                 TIMEOUT,
-                                 &my_connect_complete,
-                                 NULL);
+                                  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)
+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));
+              "Daemon `%s' started.\n", GNUNET_i2s (id));
 #endif
-  d2 = GNUNET_TESTING_daemon_start (sched,
-                                   c2,
-                                   NULL,
-                                   &my_cb2,
-                                   NULL);
+  d2 = GNUNET_TESTING_daemon_start (sched, c2, TIMEOUT, NULL, NULL, NULL, &my_cb2, NULL);
   GNUNET_assert (d2 != NULL);
 
 }
@@ -119,26 +140,18 @@ static void
 run (void *cls,
      struct GNUNET_SCHEDULER_Handle *s,
      char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   sched = s;
   ok = 1;
 #if VERBOSE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Starting daemon.\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemon.\n");
 #endif
   c1 = GNUNET_CONFIGURATION_create ();
-  GNUNET_CONFIGURATION_parse (c1,
-                             "test_testing_connect_peer1.conf");
+  GNUNET_CONFIGURATION_parse (c1, "test_testing_connect_peer1.conf");
   c2 = GNUNET_CONFIGURATION_create ();
-  GNUNET_CONFIGURATION_parse (c2,
-                             "test_testing_connect_peer2.conf");
-  d1 = GNUNET_TESTING_daemon_start (sched,
-                                   c1,
-                                   NULL,
-                                   &my_cb1,
-                                   NULL);
+  GNUNET_CONFIGURATION_parse (c2, "test_testing_connect_peer2.conf");
+  d1 = GNUNET_TESTING_daemon_start (sched, c1, TIMEOUT, NULL, NULL, NULL, &my_cb1, NULL);
   GNUNET_assert (d1 != NULL);
 }
 
@@ -175,10 +188,6 @@ main (int argc, char *argv[])
 #endif
                     NULL);
   ret = check ();
-  sleep (1);
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-testing");
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-testing-connect-peer1");
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-testing-connect-peer2");
   return ret;
 }