fix DHT start, be less verbose

5 files changed, 24 insertions, 2 deletions

diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index 43199bd91..7fd291375 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -30,30 +30,37 @@
 #include "gnunet_resolver_service.h"
 #include "gnunet_statistics_service.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 #define START_ARM GNUNET_YES
+
 #define MAX_URL_LEN 1000
 
 /**
  * How long until wait until testcases fails
  */
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 180)
+
 #define CHECK_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
 
 static int timeout;
+
 static int adv_sent;
+
 static int adv_arrived;
 
 static int learned_hostlist_saved;
+
 static int learned_hostlist_downloaded;
 
 static char * current_adv_uri;
 
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
 static struct GNUNET_SCHEDULER_Handle *sched;
 
 static GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+
 static GNUNET_SCHEDULER_TaskIdentifier check_task;
     
 struct PeerContext
@@ -73,9 +80,12 @@ static struct PeerContext adv_peer;
 static struct PeerContext learn_peer;
 
 static struct GNUNET_STATISTICS_GetHandle * download_stats;
+
 static struct GNUNET_STATISTICS_GetHandle * urisrecv_stat;
+
 static struct GNUNET_STATISTICS_GetHandle * advsent_stat;
 
+
 static void shutdown_testcase()
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown testcase....\n");
@@ -517,4 +527,4 @@ main (int argc, char *argv[])
   return ret; 
 }
 
-/* end of test_gnunet_daemon_hostlist.c */
+/* end of test_gnunet_daemon_hostlist_learning.c */
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index be5db7582..4d7d32859 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -61,3 +61,6 @@ AUTOSTART = NO
 [datastore]
 AUTOSTART = NO
 
+[dht]
+AUTOSTART = NO
+
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
index dd47a27e6..49ccdccfa 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -59,3 +59,6 @@ AUTOSTART = NO
 
 [datastore]
 AUTOSTART = NO
+
+[dht]
+AUTOSTART = NO
\ No newline at end of file
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf
index d15fe0bae..b1d263244 100644
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/src/hostlist/test_learning_adv_peer.conf
@@ -58,3 +58,6 @@ AUTOSTART = NO
 
 [datastore]
 AUTOSTART = NO
+
+[dht]
+AUTOSTART = NO
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf
index e6e6771e0..e871c609c 100644
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -60,3 +60,6 @@ AUTOSTART = NO
 
 [datastore]
 AUTOSTART = NO
+
+[dht]
+AUTOSTART = NO