test case fixes...

diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c
index fb93cef6e52891effb7eb10a95de40b1f8beade1..8dbb11525b96529e370846fe83db14bb1be9b52b 100644 (file)
--- a/src/dht/gnunet-service-dht.c
+++ b/src/dht/gnunet-service-dht.c
@@ -4468,7 +4468,7 @@ void handle_core_connect (void *cls,
     }
 
   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,

diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf
index be8578e8adba866b37eee6145cf7b52efcb1d052..17ebedbbdb051184c914975b692a77d0dcac4c56 100644 (file)
--- a/src/dht/test_dht_multipeer_data.conf
+++ b/src/dht/test_dht_multipeer_data.conf
@@ -15,6 +15,9 @@ HOME = $SERVICEHOME
 HOSTNAME = localhost
 PORT = 2100
 
+[block]
+plugins = test dht
+
 [dhtcache]
 QUOTA = 1000000
 DATABASE = sqlite

diff --git a/src/dht/test_dht_tools.sh b/src/dht/test_dht_tools.sh
index 035107997f7293969d006808b7270e435fdb5696..b22084ebbc3e9f23e3cab1527697dc11350ae3ea 100755 (executable)
--- a/src/dht/test_dht_tools.sh
+++ b/src/dht/test_dht_tools.sh
@@ -42,7 +42,7 @@ echo "PASS"
 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 -n "TEST: Testing get..."
 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

diff --git a/src/dht/test_dht_twopeer.c b/src/dht/test_dht_twopeer.c
index 51ba9ceb383767d3c59fd7f1e7755e3d9321b9a8..b9f95eb5113c5258d60612f64dab7a5819057e20 100644 (file)
--- a/src/dht/test_dht_twopeer.c
+++ b/src/dht/test_dht_twopeer.c
@@ -251,7 +251,7 @@ do_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
 
   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,

diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index 06ad962123177b24b59378d6da53d4e5ee000e5b..ea90b3c000f08b5bdb6db7af43c57458208a6e78 100644 (file)
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -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