Fixed reconnect

[oweals/gnunet.git] / src / testing / test_testing_data_topology_clique.conf

diff --git a/src/testing/test_testing_data_topology_clique.conf b/src/testing/test_testing_data_topology_clique.conf
index ab86fbf1356746ff3761df62703f7df1b8f07e8d..168af17f4bcc44af470629393568c217ab4685d2 100644 (file)
--- a/src/testing/test_testing_data_topology_clique.conf
+++ b/src/testing/test_testing_data_topology_clique.conf
@@ -1,57 +1,10 @@
+@INLINE@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
-[resolver]
-PORT = 2564
-
-[transport]
-PORT = 2565
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#PREFIX = valgrind --tool=callgrind --log-file=callgrind.%p
-#DEBUG = YES
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-ENABLE_UPNP = NO
-
-[transport-udp]
-PORT = 2568
-
-[peerinfo]
-PORT = 2569
-#DEBUG = YES
-#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
-#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
-
-[core]
-PORT = 2570
-#PREFIX = xterm -e xterm -T CORE -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[testing]
-NUM_PEERS = 4
-WEAKRANDOM = YES
-TOPOLOGY = CLIQUE
-F2F = YES
+[TESTING]
 CONNECT_TIMEOUT = 180
 CONNECT_ATTEMPTS = 14
-#DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-
-[dht]
-AUTOSTART = NO
-
+NUM_PEERS = 4
+TOPOLOGY = CLIQUE