[GNUnet-SVN] r28000 - gnunet/src/dv

[gnunet]

Author: grothoff
Date: 2013-07-13 18:07:22 +0200 (Sat, 13 Jul 2013)
New Revision: 28000

Modified:
   gnunet/src/dv/test_transport_blacklist.c
   gnunet/src/dv/test_transport_blacklist_data.conf
   gnunet/src/dv/test_transport_dv.c
   gnunet/src/dv/test_transport_dv_data.conf
Log:
-update test cases and improve output

Modified: gnunet/src/dv/test_transport_blacklist.c
===================================================================
--- gnunet/src/dv/test_transport_blacklist.c    2013-07-13 15:49:04 UTC (rev 
27999)
+++ gnunet/src/dv/test_transport_blacklist.c    2013-07-13 16:07:22 UTC (rev 
28000)
@@ -40,9 +40,15 @@
 {
   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 ();
 }
 

Modified: gnunet/src/dv/test_transport_blacklist_data.conf
===================================================================
--- gnunet/src/dv/test_transport_blacklist_data.conf    2013-07-13 15:49:04 UTC 
(rev 27999)
+++ gnunet/src/dv/test_transport_blacklist_data.conf    2013-07-13 16:07:22 UTC 
(rev 28000)
@@ -10,13 +10,14 @@
 
 [dv]
 AUTOSTART = YES
-#PREFIX = valgrind 
+PREFIX = valgrind 
 
 [consensus]
-PREFIX = valgrind
+AUTOSTART = NO
 
 [testbed]
 OVERLAY_TOPOLOGY = CLIQUE
+SETUP_TIMEOUT = 5 s
 
 [fs]
 AUTOSTART = NO

Modified: gnunet/src/dv/test_transport_dv.c
===================================================================
--- gnunet/src/dv/test_transport_dv.c   2013-07-13 15:49:04 UTC (rev 27999)
+++ gnunet/src/dv/test_transport_dv.c   2013-07-13 16:07:22 UTC (rev 28000)
@@ -46,7 +46,9 @@
   }
   ok = 0;
   if (1)
+  {
     GNUNET_SCHEDULER_shutdown ();
+  }
   else
     fprintf (stderr, "Test passed, press CTRL-C to shut down\n");
 }

Modified: gnunet/src/dv/test_transport_dv_data.conf
===================================================================
--- gnunet/src/dv/test_transport_dv_data.conf   2013-07-13 15:49:04 UTC (rev 
27999)
+++ gnunet/src/dv/test_transport_dv_data.conf   2013-07-13 16:07:22 UTC (rev 
28000)
@@ -13,10 +13,11 @@
 #PREFIX = valgrind 
 
 [consensus]
-PREFIX = valgrind
+AUTOSTART = NO
 
 [testbed]
 OVERLAY_TOPOLOGY = CLIQUE
+SETUP_TIMEOUT = 30 s
 
 [fs]
 AUTOSTART = NO
@@ -43,7 +44,7 @@
 AUTOSTART = NO
 
 [lockmanager]
-AUTOSTART = YES
+AUTOSTART = NO
 
 # Topology:
 # 5M-HT