fixes, comments

diff --git a/src/testing/test_testing_connect.c b/src/testing/test_testing_connect.c
index 3ddb9dbac4fa037e5680def6c6265e7e7ea1c3f3..2857b7a4f52712f6cc92a2d5a9a7d48110b25680 100644 (file)
--- a/src/testing/test_testing_connect.c
+++ b/src/testing/test_testing_connect.c
@@ -188,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;
 }
 

diff --git a/src/testing/test_testing_group.c b/src/testing/test_testing_group.c
index f222fbb82831c91676a163fdaf2845635a9074e3..81d949e2a2d14d77c5bec1d61aa67a44ef7fb605 100644 (file)
--- a/src/testing/test_testing_group.c
+++ b/src/testing/test_testing_group.c
@@ -65,10 +65,8 @@ my_cb (void *cls,
     }
 
   peers_left--;
-  fprintf(stderr, "peers_left is %d, failed_peers is %d\n", peers_left, failed_peers);
   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);
       ok = 0;

diff --git a/src/testing/test_testing_topology.c b/src/testing/test_testing_topology.c
index 50ee0086afef7c6b4d3e7c857d011c9999a10990..56d3baea60bb07547c34b36d9b685f8b4fede600 100644 (file)
--- a/src/testing/test_testing_topology.c
+++ b/src/testing/test_testing_topology.c
@@ -25,7 +25,7 @@
 #include "gnunet_testing_lib.h"
 #include "gnunet_core_service.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 /**
  * How long until we fail the whole testcase?

diff --git a/src/testing/testing.c b/src/testing/testing.c
index 82abbdd97bd94a28b76071fc129d6676317cf3eb..a04c6c2de05cafc2c018386876361c478d85abbd 100644 (file)
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -544,7 +544,6 @@ start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
               return;
             }
           /* wait some more */
-          fprintf(stderr, "scheduling in shutdown_start\n");
           d->task
             = GNUNET_SCHEDULER_add_delayed (d->sched,
                                             GNUNET_CONSTANTS_EXEC_WAIT,
@@ -1020,7 +1019,6 @@ GNUNET_TESTING_daemon_stop (struct GNUNET_TESTING_Daemon *d,
 
   GNUNET_free_non_null(del_arg);
   d->max_timeout = GNUNET_TIME_relative_to_absolute(timeout);
-  fprintf(stderr, "scheduling shutdown fsm phase\n");
   d->task
     = GNUNET_SCHEDULER_add_now (d->sched,
                                 &start_fsm, d);

diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c
index aa1d5da69a5599393b66a44b21eace4e94a6e466..d777382964de2a4b623fe14c7c36b79b65ec6fcc 100644 (file)
--- a/src/testing/testing_group.c
+++ b/src/testing/testing_group.c
@@ -1396,6 +1396,7 @@ create_and_copy_friend_files (struct GNUNET_TESTING_PeerGroup *pg)
       count++;
       if (ret == GNUNET_SYSERR)
         {
+         /* FIXME: why sleep here? -CG */
           sleep(1);
         }
     }
@@ -1547,6 +1548,7 @@ create_and_copy_blacklist_files (struct GNUNET_TESTING_PeerGroup *pg, char *tran
       count++;
       if (ret == GNUNET_SYSERR)
         {
+         /* FIXME: why sleep here? -CG */
           sleep(1);
         }
     }