Fix for testing where peer_start callback immediately calls peer_stop (also white space changes)

1 files changed, 15 insertions, 12 deletions

diff --git a/src/testing/test_testing_group.c b/src/testing/test_testing_group.c
index b1e6be395..e3a3b2e63 100644
--- a/src/testing/test_testing_group.c
+++ b/src/testing/test_testing_group.c
@@ -44,14 +44,13 @@ static struct GNUNET_TESTING_PeerGroup *pg;
 /**
  * Check whether peers successfully shut down.
  */
-void shutdown_callback (void *cls,
-                        const char *emsg)
+void
+shutdown_callback (void *cls, const char *emsg)
 {
   if (emsg != NULL)
     {
 #if VERBOSE
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Shutdown of peers failed!\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown of peers failed!\n");
 #endif
       if (ok == 0)
         ok = 666;
@@ -74,28 +73,32 @@ my_cb (void *cls,
 {
   if (id == NULL)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Start callback called with error (too long starting peers), aborting test!\n");
+      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++;
       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);
-        }
+        {
+          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)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers started successfully, ending test!\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "All peers started successfully, ending test!\n");
       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_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Too many peers failed, ending test!\n");
       ok = 1;
       GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
     }