1 files changed, 6 insertions, 15 deletions

diff --git a/src/dht/test_dht_tools.sh b/src/dht/test_dht_tools.sh
index f83c26a1a..56cc99e15 100755
--- a/src/dht/test_dht_tools.sh
+++ b/src/dht/test_dht_tools.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
+# This file is in the public domain.
 
 out=`mktemp /tmp/test-gnunet-dht-logXXXXXXXX`
-tempcfg=`mktemp /tmp/test_dht_api_peer1.XXXXXXXX`
+tempcfg=`mktemp /tmp/test-dht-tools.XXXXXXXX`
 checkout="check.out"
 armexe="gnunet-arm -c $tempcfg "
 putexe="gnunet-dht-put -c $tempcfg "
@@ -19,16 +20,7 @@ stop_arm()
   rm -f $out $tempcfg
 }
 
-cp test_dht_api_peer1.conf $tempcfg
-
-echo -n "TEST: Generating hostkey..."
-if ! $peerinfo > $out ; then
-  echo "FAIL: error running $peerinfo"
-  echo "Command output was:"
-  cat $out 
-  exit 1
-fi
-echo "PASS"
+cp test_dht_tools.conf $tempcfg
 
 echo -n "TEST: Starting ARM..."
 if ! $armexe $DEBUG -s > $out ; then
@@ -39,7 +31,6 @@ if ! $armexe $DEBUG -s > $out ; then
   exit 1
 fi
 echo "PASS"
-sleep 1
 
 echo -n "TEST: Testing put..."
 if ! $putexe -k testkey -d testdata -t 8 > $out ; then
@@ -50,13 +41,12 @@ if ! $putexe -k testkey -d testdata -t 8 > $out ; then
   exit 1
 fi
 echo "PASS"
-sleep 1
 
 echo -n "TEST: Testing get..."
 echo "Result 0, type 8:" > $checkout
 echo "testdata" >> $checkout
 
-if ! $getexe -k testkey -T 5 -t 8 > $out ; then
+if ! $getexe -k testkey -T 100ms -t 8 > $out ; then
   echo "FAIL: error running $putexe"
   echo "Command output was:"
   cat $out
@@ -65,7 +55,8 @@ if ! $getexe -k testkey -T 5 -t 8 > $out ; then
 fi
 
 if ! diff --strip-trailing-cr -q $out $checkout ; then
-  echo "FAIL: $out and $checkout differ"
+  echo "FAIL: $out and $checkout differ:"
+  diff --strip-trailing-cr $out $checkout
   stop_arm
   exit 1
 fi