-more script tests

5 files changed, 31 insertions, 12 deletions

diff --git a/src/gns/egos/delegatedego b/src/gns/egos/delegatedego
new file mode 100644
index 000000000..3ef49f0ac
--- /dev/null
+++ b/src/gns/egos/delegatedego
diff --git a/src/gns/egos/testego b/src/gns/egos/testego
new file mode 100644
index 000000000..895946037
--- /dev/null
+++ b/src/gns/egos/testego
diff --git a/src/gns/test_gns_delegated_lookup.sh b/src/gns/test_gns_delegated_lookup.sh
new file mode 100644
index 000000000..92fdbe9d2
--- /dev/null
+++ b/src/gns/test_gns_delegated_lookup.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+TEST_IP="127.0.0.1"
+DELEGATED_PKEY=$(gnunet-ecc -p egos/delegatedego)
+
+gnunet-arm -s -c test_gns_lookup.conf
+
+#gnunet-identity -C testego -c test_gns_lookup.conf
+
+gnunet-namestore -p -z testego -a -n b -t PKEY -V $DELEGATED_PKEY -e never -c test_gns_lookup.conf
+gnunet-namestore -p -z delegatedego -a -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf
+RES_IP=$(gnunet-gns --raw -z testego -u www.b.gnu -t A -c test_gns_lookup.conf)
+
+gnunet-namestore -z testego -d -n b -t PKEY -V $DELEGATED_PKEY  -e never -c test_gns_lookup.conf
+gnunet-namestore -z delegatedego -d -n www -t A -V $TEST_IP  -e never -c test_gns_lookup.conf
+
+gnunet-arm -e -c test_gns_lookup.conf
+
+if [ "$RES_IP" == "$TEST_IP" ]
+then
+  exit 0
+else
+  exit 1
+fi
+
diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf
index 687dff71e..cdb6bace3 100644
--- a/src/gns/test_gns_lookup.conf
+++ b/src/gns/test_gns_lookup.conf
@@ -33,7 +33,7 @@ WAN_QUOTA_OUT = 1 GB
 PORT = 12092
 
 [arm]
-DEFAULTSERVICES = core dht namestore gns
+DEFAULTSERVICES = core dht namestore
 PORT = 12366
 
 [transport-tcp]
@@ -62,12 +62,6 @@ DNS_EXIT = 8.8.8.8
 #PREFIX = valgrind --leak-check=full --track-origins=yes 
 AUTOSTART = YES
 BINARY = gnunet-service-gns
-ZONEKEY = zonefiles/test_zonekey
-PRIVATE_ZONE = private
-PRIVATE_ZONEKEY = zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey
-SHORTEN_ZONE = short
-SHORTEN_ZONEKEY = zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey
-#ZONEKEY =  $SERVICEHOME/gns/zonekey.zkey
 HIJACK_DNS = NO
 UNIXPATH = /tmp/gnunet-service-gns.sock
 HOME = $SERVICEHOME
@@ -96,5 +90,8 @@ ACCEPT_FROM6 = ::1;
 DATABASE = sqlite
 ZONEFILE_DIRECTORY = $SERVICEHOME
 
+[identity]
+EGODIR = egos/
+
 [namestore-sqlite]
 FILENAME = $SERVICEHOME/sqlite-default.db
diff --git a/src/gns/test_gns_lookup.sh b/src/gns/test_gns_lookup.sh
index a2c531ebb..b15c114fd 100644
--- a/src/gns/test_gns_lookup.sh
+++ b/src/gns/test_gns_lookup.sh
@@ -4,10 +4,9 @@ TEST_IP="127.0.0.1"
 
 gnunet-arm -s -c test_gns_lookup.conf
 
-gnunet-identity -C testego -c test_gns_lookup.conf
-
-gnunet-namestore -z testego -a -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf
+#gnunet-identity -C testego -c test_gns_lookup.conf
 
+gnunet-namestore -p -z testego -a -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf
 RES_IP=$(gnunet-gns --raw -z testego -u www.gnu -t A -c test_gns_lookup.conf)
 
 gnunet-namestore -z testego -d -n www -t A -V $TEST_IP -e never -c test_gns_lookup.conf
@@ -16,10 +15,8 @@ gnunet-arm -e -c test_gns_lookup.conf
 
 if [ "$RES_IP" == "$TEST_IP" ]
 then
-  echo "OK"
   exit 0
 else
-  echo "Result $RES_IP NOTOK"
   exit 1
 fi