stagger shutdown

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

diff --git a/src/testing/test_testing_group.c b/src/testing/test_testing_group.c
index 2429c45254d1c66f72bec39fead54b461de61181..6eacaca45d9f727fcbdbed8886773a72f3bf79ad 100644 (file)
--- a/src/testing/test_testing_group.c
+++ b/src/testing/test_testing_group.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
@@ -43,6 +43,30 @@ static struct GNUNET_TESTING_PeerGroup *pg;
 
 static struct GNUNET_SCHEDULER_Handle *sched;
 
+/**
+ * Check whether peers successfully shut down.
+ */
+void shutdown_callback (void *cls,
+                        const char *emsg)
+{
+  if (emsg != NULL)
+    {
+#if VERBOSE
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Shutdown of peers failed!\n");
+#endif
+      if (ok == 0)
+        ok = 666;
+    }
+  else
+    {
+#if VERBOSE
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "All peers successfully shut down!\n");
+#endif
+    }
+}
+
 
 static void
 my_cb (void *cls,
@@ -55,21 +79,27 @@ my_cb (void *cls,
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Start callback called with error (too long starting peers), aborting test!\n");
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Error from testing: `%s'\n");
       failed_peers++;
-      ok = 7;
+      if (failed_peers == peers_left)
+       {
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Too many peers failed, ending test!\n");
+         ok = 1;
+         GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+       }
+      return;
     }
 
   peers_left--;
   if (peers_left == 0)
     {
-      sleep(2); /* Give other services a chance to initialize before killing */
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers started successfully, ending test!\n");
-      GNUNET_TESTING_daemons_stop (pg, TIMEOUT);
+      GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
       ok = 0;
     }
   else if (failed_peers == peers_left)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Too many peers failed, ending test!\n");
-      GNUNET_TESTING_daemons_stop (pg, TIMEOUT);
+      ok = 1;
+      GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
     }
 }