[GNUnet-SVN] r13174 - gnunet/src/dht

[gnunet]

Author: nevans
Date: 2010-10-06 11:43:52 +0200 (Wed, 06 Oct 2010)
New Revision: 13174

Modified:
   gnunet/src/dht/gnunet-service-dht.c
   gnunet/src/dht/test_dht_multipeer_data.conf
   gnunet/src/dht/test_dht_tools.sh
   gnunet/src/dht/test_dht_twopeer.c
   gnunet/src/dht/test_dht_twopeer_data.conf
Log:
test case fixes...

Modified: gnunet/src/dht/gnunet-service-dht.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht.c 2010-10-06 09:27:41 UTC (rev 13173)
+++ gnunet/src/dht/gnunet-service-dht.c 2010-10-06 09:43:52 UTC (rev 13174)
@@ -4468,7 +4468,7 @@
     }
 
   if (datacache != NULL)
-    GNUNET_DATACACHE_put(datacache, &peer->hashPubKey, sizeof(struct 
GNUNET_PeerIdentity), (const char *)peer, 0, 
GNUNET_TIME_absolute_get_forever());
+    GNUNET_DATACACHE_put(datacache, &peer->hashPubKey, sizeof(struct 
GNUNET_PeerIdentity), (const char *)peer, GNUNET_BLOCK_TYPE_DHT_HELLO, 
GNUNET_TIME_absolute_get_forever());
   ret = try_add_peer(peer,
                      find_current_bucket(&peer->hashPubKey),
                      latency,

Modified: gnunet/src/dht/test_dht_multipeer_data.conf
===================================================================
--- gnunet/src/dht/test_dht_multipeer_data.conf 2010-10-06 09:27:41 UTC (rev 
13173)
+++ gnunet/src/dht/test_dht_multipeer_data.conf 2010-10-06 09:43:52 UTC (rev 
13174)
@@ -15,6 +15,9 @@
 HOSTNAME = localhost
 PORT = 2100
 
+[block]
+plugins = test dht
+
 [dhtcache]
 QUOTA = 1000000
 DATABASE = sqlite

Modified: gnunet/src/dht/test_dht_tools.sh
===================================================================
--- gnunet/src/dht/test_dht_tools.sh    2010-10-06 09:27:41 UTC (rev 13173)
+++ gnunet/src/dht/test_dht_tools.sh    2010-10-06 09:43:52 UTC (rev 13174)
@@ -42,7 +42,7 @@
 sleep 1
 
 echo -n "TEST: Testing put..."
-if ! $putexe -k testkey -d testdata > $out ; then
+if ! $putexe -k testkey -d testdata -T 8 > $out ; then
   echo "FAIL: error running $putexe"
   echo "Command output was:"
   cat $out
@@ -56,7 +56,7 @@
 echo "Result 0, type 0:" > $checkout
 echo "testdata" >> $checkout
 
-if ! $getexe -k testkey -T 1 > $out ; then
+if ! $getexe -k testkey -T 8 > $out ; then
   echo "FAIL: error running $putexe"
   echo "Command output was:"
   cat $out

Modified: gnunet/src/dht/test_dht_twopeer.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer.c   2010-10-06 09:27:41 UTC (rev 13173)
+++ gnunet/src/dht/test_dht_twopeer.c   2010-10-06 09:43:52 UTC (rev 13174)
@@ -251,7 +251,7 @@
 
   get_context->get_handle = GNUNET_DHT_get_start(get_context->dht_handle, 
                                                 
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5),
-                                                 0 /* fixme: real type */, 
+                                                GNUNET_BLOCK_TYPE_DHT_HELLO,
                                                 &get_context->peer->hashPubKey,
                                                 GNUNET_DHT_RO_NONE,
                                                 NULL, 0,

Modified: gnunet/src/dht/test_dht_twopeer_data.conf
===================================================================
--- gnunet/src/dht/test_dht_twopeer_data.conf   2010-10-06 09:27:41 UTC (rev 
13173)
+++ gnunet/src/dht/test_dht_twopeer_data.conf   2010-10-06 09:43:52 UTC (rev 
13174)
@@ -2,12 +2,15 @@
 AUTOSTART = NO
 
 [dht]
-DEBUG = NO
+DEBUG = YES
 AUTOSTART = YES
 #PREFIX = xterm -T dht -e gdb --args
 PORT = 2100
 DISABLE_SOCKET_FORWARDING = YES
 
+[block]
+plugins = test dht
+
 [dhtcache]
 QUOTA = 1000000
 DATABASE = sqlite