stagger shutdown

[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 735d0a7c1e1cd53e9988b3d9892f0fbc7e14e901..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,11 +26,10 @@
 
 #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
 
@@ -68,7 +67,16 @@ end2_cb (void *cls, const char *emsg)
 static void
 end1_cb (void *cls, const char *emsg)
 {
-  GNUNET_assert (emsg == 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;
 }
@@ -84,6 +92,7 @@ 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,
@@ -179,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;
 }