From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 2 Jul 2010 07:10:58 +0000 (+0000)
Subject: slightly more moderate timeout
X-Git-Tag: initial-import-from-subversion-38251~21097
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=394db0b2454bc7f59a7e0f4360bc5056d82c4727;p=oweals%2Fgnunet.git

slightly more moderate timeout
---

diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index c055a6208..d998e9d86 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -34,7 +34,7 @@
 /**
  * Timeout for stopping services.  Long to give some services a real chance.
  */
-#define STOP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 360)
+#define STOP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
 
 /**
  * Timeout for starting services, very short because of the strange way start works
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf
index 8f832a58c..5f7dd8330 100644
--- a/src/transport/test_transport_api_tcp_peer1.conf
+++ b/src/transport/test_transport_api_tcp_peer1.conf
@@ -69,7 +69,7 @@ PORT = 1236
 UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [statistics]
-AUTOSTART = NO
+AUTOSTART = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-statistics
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf
index 5a53e78a2..4a4219d7b 100644
--- a/src/transport/test_transport_api_tcp_peer2.conf
+++ b/src/transport/test_transport_api_tcp_peer2.conf
@@ -70,7 +70,7 @@ PORT = 22364
 UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [statistics]
-AUTOSTART = NO
+AUTOSTART = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-statistics