[GNUnet-SVN] r11422 - gnunet/src/testing

[gnunet]

Author: grothoff
Date: 2010-05-18 14:22:55 +0200 (Tue, 18 May 2010)
New Revision: 11422

Modified:
   gnunet/src/testing/test_testing_connect.c
   gnunet/src/testing/test_testing_group.c
   gnunet/src/testing/test_testing_topology.c
   gnunet/src/testing/testing.c
   gnunet/src/testing/testing_group.c
Log:
fixes, comments

Modified: gnunet/src/testing/test_testing_connect.c
===================================================================
--- gnunet/src/testing/test_testing_connect.c   2010-05-18 08:48:55 UTC (rev 
11421)
+++ gnunet/src/testing/test_testing_connect.c   2010-05-18 12:22:55 UTC (rev 
11422)
@@ -188,10 +188,6 @@
 #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;
 }
 

Modified: gnunet/src/testing/test_testing_group.c
===================================================================
--- gnunet/src/testing/test_testing_group.c     2010-05-18 08:48:55 UTC (rev 
11421)
+++ gnunet/src/testing/test_testing_group.c     2010-05-18 12:22:55 UTC (rev 
11422)
@@ -65,10 +65,8 @@
     }
 
   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;

Modified: gnunet/src/testing/test_testing_topology.c
===================================================================
--- gnunet/src/testing/test_testing_topology.c  2010-05-18 08:48:55 UTC (rev 
11421)
+++ gnunet/src/testing/test_testing_topology.c  2010-05-18 12:22:55 UTC (rev 
11422)
@@ -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?

Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c        2010-05-18 08:48:55 UTC (rev 11421)
+++ gnunet/src/testing/testing.c        2010-05-18 12:22:55 UTC (rev 11422)
@@ -544,7 +544,6 @@
               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_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);

Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c  2010-05-18 08:48:55 UTC (rev 11421)
+++ gnunet/src/testing/testing_group.c  2010-05-18 12:22:55 UTC (rev 11422)
@@ -1396,6 +1396,7 @@
       count++;
       if (ret == GNUNET_SYSERR)
         {
+         /* FIXME: why sleep here? -CG */
           sleep(1);
         }
     }
@@ -1547,6 +1548,7 @@
       count++;
       if (ret == GNUNET_SYSERR)
         {
+         /* FIXME: why sleep here? -CG */
           sleep(1);
         }
     }