aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-07-02 07:10:58 +0000
committerChristian Grothoff <christian@grothoff.org>2010-07-02 07:10:58 +0000
commit394db0b2454bc7f59a7e0f4360bc5056d82c4727 (patch)
treeb5401ae6e4e1f87bd409df9e12332c159b292d1e
parent7c814e0e6d1049736e91e83305ddff9a48f27c71 (diff)
slightly more moderate timeout
-rw-r--r--src/arm/gnunet-arm.c2
-rw-r--r--src/transport/test_transport_api_tcp_peer1.conf2
-rw-r--r--src/transport/test_transport_api_tcp_peer2.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index c055a6208f..d998e9d866 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 8f832a58c4..5f7dd8330e 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 5a53e78a24..4a4219d7bb 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