-hostlist tests need topology

[oweals/gnunet.git] / src / hostlist / test_gnunet_daemon_hostlist_peer1.conf

diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index 2a46763bf77e3f0a6686f48199b86a0c80c3077b..6269a13fe201285b036d86af9f0bea991ea1ffc2 100644 (file)
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -1,56 +1,44 @@
+@INLINE@ test_hostlist_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-1/
-DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer1.conf
+GNUNET_TEST_HOME = /tmp/test-gnunet-hostlist-peer-1/
 
-[resolver]
-PORT = 12964
-
-[transport]
-PORT = 12965
-PLUGINS = tcp
-#DEBUG = YES
-DEBUG = NO
+[transport-tcp]
+PORT = 12968
 
 [arm]
 PORT = 12966
-DEFAULTSERVICES = hostlist topology
-#GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12967
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock
 
-[transport-tcp]
-PORT = 12968
-DEBUG = NO
+[resolver]
+PORT = 12964
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12969
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
+
+[transport]
+PORT = 12965
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 [core]
 PORT = 12970
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck\
-DEBUG = NO
-
-[testing]
-WEAKRANDOM = YES
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-core.sock
 
 [hostlist]
 HTTPPORT = 12980
-SERVERS = http://localhost:12981/
-OPTIONS = -b -p
 HOSTLISTFILE = hostlists_peer1.file
-#DEBUG = YES
-#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
-DEBUG = NO
-
-[topology]
-#DEBUG = YES
-#PREFIX = valgrind --tool=memcheck
-DEBUG = NO
+OPTIONS = -b -p
+SERVERS = http://localhost:22981/
+FORCESTART = YES
 
-[fs]
-AUTOSTART = NO
+[ats]
+PORT = 12971
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock
 
-[datastore]
-AUTOSTART = NO[fs]
+[topology]
+FORCESTART = YES
\ No newline at end of file