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

[gnunet]

Author: bartpolot
Date: 2011-11-08 22:38:47 +0100 (Tue, 08 Nov 2011)
New Revision: 18057

Modified:
   gnunet/src/testing/testing_peergroup.c
Log:
Attempt to fix error on peergroup start on buildbots

Modified: gnunet/src/testing/testing_peergroup.c
===================================================================
--- gnunet/src/testing/testing_peergroup.c      2011-11-08 21:27:30 UTC (rev 
18056)
+++ gnunet/src/testing/testing_peergroup.c      2011-11-08 21:38:47 UTC (rev 
18057)
@@ -33,7 +33,7 @@
 #include "gnunet_disk_lib.h"
 
 /** Globals **/
-#define DEFAULT_CONNECT_TIMEOUT 
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30)
+#define DEFAULT_CONNECT_TIMEOUT 30 // FIXME: use fancy time
 
 #define DEFAULT_CONNECT_ATTEMPTS 2
 
@@ -46,7 +46,17 @@
   unsigned int total;
   unsigned int peers_left;
   unsigned long long max_concurrent_connections;
+  
+  /**
+   * Maximum attemps to connect two daemons.
+   */
   unsigned long long connect_attempts;
+
+  /**
+   * How long to spend trying to establish all the connections?
+   */
+  unsigned long long connect_timeout; // FIXME: use fancy time
+  
   unsigned long long max_concurrent_ssh;
   struct GNUNET_TIME_Absolute timeout;
   GNUNET_TESTING_NotifyConnection connect_cb;
@@ -498,7 +508,10 @@
                                            pg_start_ctx->connect_topology,
                                            
pg_start_ctx->connect_topology_option,
                                            
pg_start_ctx->connect_topology_option_modifier,
-                                           DEFAULT_CONNECT_TIMEOUT,
+                                           // FIXME: use fancy time
+                                           GNUNET_TIME_relative_multiply(
+                                             GNUNET_TIME_UNIT_SECONDS,
+                                             pg_start_ctx->connect_timeout),
                                            pg_start_ctx->connect_attempts, 
NULL,
                                            NULL);
 
@@ -744,6 +757,13 @@
   }
 
   if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "connect_timeout",
+                                             &pg_start_ctx->connect_timeout))
+  {
+    pg_start_ctx->connect_timeout = DEFAULT_CONNECT_TIMEOUT;
+  }
+
+  if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (cfg, "testing",
                                              "max_outstanding_connections",
                                              
&pg_start_ctx->max_concurrent_connections))