new timeout tests for WLAN and bluetooth

[oweals/gnunet.git] / src / nse / test_nse.conf

diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index 219ac6b5e995e4193d2ec52a9375c22e27bf89fc..b6239140ef2ee8ccb3b7d605e9a9fd700d642f4b 100644 (file)
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -1,30 +1,27 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-nse/
-DEFAULTCONFIG = test_nse.conf
+GNUNET_TEST_HOME = /tmp/test-nse-multipeer/
 
 [nse]
 PORT = 22353
-UNIXPATH = /tmp/test-nse-service-nse.unix
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-nse.unix
 BINARY = gnunet-service-nse
 #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
 #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
 AUTOSTART = YES
-DEBUG = YES
-CONFIG = $DEFAULTCONFIG
-
+PROOFFILE = $GNUNET_TEST_HOME/proof.nse
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
-WORKDELAY = 1
-INTERVAL = 15000
-WORKBITS = 8
+WORKDELAY = 1 ms
+INTERVAL = 60 s
+WORKBITS = 1
 
+HISTOGRAM = $GNUNET_TEST_HOME/nse-histogram
 
 
 [arm]
 PORT = 22354
 DEFAULTSERVICES = nse core
-UNIXPATH = /tmp/test-nse-service-arm.unix
-#DEBUG = YES
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix
 
 [fs]
 AUTOSTART = NO
@@ -57,19 +54,23 @@ EXTERNAL_ADDRESS = 127.0.0.1
 AUTOSTART = NO
 
 [testing]
-NUM_PEERS = 1000
 WEAKRANDOM = YES
+
+[testing_old]
+NUM_PEERS = 10
 TOPOLOGY = NONE
 CONNECT_TOPOLOGY = SMALL_WORLD_RING
 PERCENTAGE = 3
 F2F = NO
-CONNECT_TIMEOUT = 60
+CONNECT_TIMEOUT = 60 s
 CONNECT_ATTEMPTS = 3
-#DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 20
 USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 1000
+PEERGROUP_TIMEOUT = 1000 s
 
+DELETE_FILES = NO
 
 
+[consensus]
+AUTOSTART = NO