put and get testcase

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 8ae5c4199b5e68993e9f433a13f8d6668e286982..ecf5a2e925ef66e58cbdaef4273f0778741443f1 100644 (file)
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -49,9 +49,9 @@ gnunet_dht_put_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la 
 
 check_PROGRAMS = \
- test_dht_api
+ test_dht_api 
 
-TESTS = $(check_PROGRAMS) # $(check_SCRIPTS)
+TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 
 test_dht_api_SOURCES = \
  test_dht_api.c
@@ -62,5 +62,5 @@ test_dht_api_LDADD = \
 EXTRA_DIST = \
   test_dht_api_data.conf 
 
-#check_SCRIPTS = \
-#  test_gnunet_peerinfo.sh
+check_SCRIPTS = \
+  test_dht_tools.sh

diff --git a/src/dht/gnunet-dht-get.c b/src/dht/gnunet-dht-get.c
index de36610bdab66c0087fe7943913a0dee170a81c9..684f7c3081286114c3035ee841cfdd56669cb3a1 100644 (file)
--- a/src/dht/gnunet-dht-get.c
+++ b/src/dht/gnunet-dht-get.c
@@ -213,10 +213,10 @@ static struct GNUNET_GETOPT_CommandLineOption options[] = {
    1, &GNUNET_GETOPT_set_string, &query_key},
   {'t', "type", "TYPE",
    gettext_noop ("the type of data to look for"),
-   0, &GNUNET_GETOPT_set_uint, &query_type},
+   1, &GNUNET_GETOPT_set_uint, &query_type},
   {'T', "timeout", "TIMEOUT",
    gettext_noop ("how long to execute this query before giving up?"),
-   0, &GNUNET_GETOPT_set_ulong, &timeout_request},
+   1, &GNUNET_GETOPT_set_ulong, &timeout_request},
   {'V', "verbose", NULL,
    gettext_noop ("be verbose (print progress information)"),
    0, &GNUNET_GETOPT_set_one, &verbose},

diff --git a/src/dht/gnunet-dht-put.c b/src/dht/gnunet-dht-put.c
index 4d25847fb86374155086d58cfe4bfb8e7bac4c33..db3f11811c6124628ac06391b5540c915b356fba 100644 (file)
--- a/src/dht/gnunet-dht-put.c
+++ b/src/dht/gnunet-dht-put.c
@@ -183,13 +183,13 @@ static struct GNUNET_GETOPT_CommandLineOption options[] = {
    1, &GNUNET_GETOPT_set_string, &data},
   {'t', "type", "TYPE",
    gettext_noop ("the type to insert data as"),
-   0, &GNUNET_GETOPT_set_uint, &query_type},
+   1, &GNUNET_GETOPT_set_uint, &query_type},
   {'T', "timeout", "TIMEOUT",
    gettext_noop ("how long to execute this query before giving up?"),
-   0, &GNUNET_GETOPT_set_ulong, &timeout_request},
+   1, &GNUNET_GETOPT_set_ulong, &timeout_request},
   {'e', "expiration", "EXPIRATION",
    gettext_noop ("how long to store this entry in the dht (in seconds)"),
-   0, &GNUNET_GETOPT_set_ulong, &expiration_seconds},
+   1, &GNUNET_GETOPT_set_ulong, &expiration_seconds},
   {'V', "verbose", NULL,
    gettext_noop ("be verbose (print progress information)"),
    0, &GNUNET_GETOPT_set_one, &verbose},

diff --git a/src/dht/test_dht_tools.sh b/src/dht/test_dht_tools.sh
new file mode 100755 (executable)
index 0000000..c026ecf
--- /dev/null
+++ b/src/dht/test_dht_tools.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+armexe="gnunet-arm -c test_dht_api_peer1.conf "
+putexe="gnunet-dht-put -c test_dht_api_peer1.conf "
+getexe="gnunet-dht-get -c test_dht_api_peer1.conf "
+out=`mktemp /tmp/test-gnunet-arm-logXXXXXXXX`
+checkout="check.out"
+
+stop_arm()
+{
+  if ! $armexe $DEBUG -e > $out ; then
+    echo "FAIL: error running $armexe"
+    echo "Command output was:"
+    cat $out
+    stop_arm
+    exit 1
+  fi
+}
+
+echo -n "TEST: Starting ARM..."
+if ! $armexe $DEBUG -s > $out ; then
+  echo "FAIL: error running $armexe"
+  echo "Command output was:"
+  cat $out
+  stop_arm
+  exit 1
+fi
+echo "PASS"
+sleep 1
+
+echo -n "TEST: Testing put..."
+if ! $putexe -k testkey -d testdata > $out ; then
+  echo "FAIL: error running $putexe"
+  echo "Command output was:"
+  cat $out
+  stop_arm
+  exit 1
+fi
+echo "PASS"
+sleep 1
+
+echo -n "TEST: Testing get..."
+echo "Result 0, type 0:" > $checkout
+echo "testdata" >> $checkout
+
+if ! $getexe -k testkey -T 1 > $out ; then
+  echo "FAIL: error running $putexe"
+  echo "Command output was:"
+  cat $out
+  stop_arm
+  exit 1
+fi
+if ! diff -q $out $checkout ; then
+  echo "FAIL: $out and $checkout differ"
+  stop_arm
+  exit 1
+fi
+echo "PASS"
+
+stop_arm