-update test cases and improve output

4 files changed, 15 insertions, 5 deletions

diff --git a/src/dv/test_transport_blacklist.c b/src/dv/test_transport_blacklist.c
index 76120b430..834cde19a 100644
--- a/src/dv/test_transport_blacklist.c
+++ b/src/dv/test_transport_blacklist.c
@@ -40,9 +40,15 @@ test_connection (void *cls,
 {
   if ( (4 == num_peers) && (0 == links_failed) )
   {
-    fprintf (stderr, "Testbed connect peers despite blacklist!\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                "Testbed connect peers despite blacklist!\n");
     ok = 1;
   }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Note that getting a message about a timeout during setup is expected for this test.\n");
+  }
   GNUNET_SCHEDULER_shutdown ();
 }
 
diff --git a/src/dv/test_transport_blacklist_data.conf b/src/dv/test_transport_blacklist_data.conf
index 2c7829b67..8a266a970 100644
--- a/src/dv/test_transport_blacklist_data.conf
+++ b/src/dv/test_transport_blacklist_data.conf
@@ -10,13 +10,14 @@ DEFAULTSERVICES = core
 
 [dv]
 AUTOSTART = YES
-#PREFIX = valgrind 
+PREFIX = valgrind 
 
 [consensus]
-PREFIX = valgrind
+AUTOSTART = NO
 
 [testbed]
 OVERLAY_TOPOLOGY = CLIQUE
+SETUP_TIMEOUT = 5 s
 
 [fs]
 AUTOSTART = NO
diff --git a/src/dv/test_transport_dv.c b/src/dv/test_transport_dv.c
index 8e3c6a73d..ea19ad201 100644
--- a/src/dv/test_transport_dv.c
+++ b/src/dv/test_transport_dv.c
@@ -46,7 +46,9 @@ test_connection (void *cls,
   }
   ok = 0;
   if (1)
+  {
     GNUNET_SCHEDULER_shutdown ();
+  }
   else
     fprintf (stderr, "Test passed, press CTRL-C to shut down\n");
 }
diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index 01a5bd0cb..14103acc2 100644
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -13,10 +13,11 @@ AUTOSTART = YES
 #PREFIX = valgrind 
 
 [consensus]
-PREFIX = valgrind
+AUTOSTART = NO
 
 [testbed]
 OVERLAY_TOPOLOGY = CLIQUE
+SETUP_TIMEOUT = 30 s
 
 [fs]
 AUTOSTART = NO
@@ -43,7 +44,7 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 [lockmanager]
-AUTOSTART = YES
+AUTOSTART = NO
 
 # Topology:
 # 5M-HT