[GNUnet-SVN] r29504 - in gnunet/src/gns: . egos

[gnunet]

Author: schanzen
Date: 2013-09-23 19:53:18 +0200 (Mon, 23 Sep 2013)
New Revision: 29504

Added:
   gnunet/src/gns/egos/
   gnunet/src/gns/egos/delegatedego
   gnunet/src/gns/egos/testego
   gnunet/src/gns/test_gns_delegated_lookup.sh
Modified:
   gnunet/src/gns/test_gns_lookup.conf
   gnunet/src/gns/test_gns_lookup.sh
Log:
-more script tests

Copied: gnunet/src/gns/egos/delegatedego (from rev 29472, 
gnunet/src/gns/zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey)
===================================================================
(Binary files differ)

Copied: gnunet/src/gns/egos/testego (from rev 29472, 
gnunet/src/gns/zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey)
===================================================================
(Binary files differ)

Added: gnunet/src/gns/test_gns_delegated_lookup.sh
===================================================================
--- gnunet/src/gns/test_gns_delegated_lookup.sh                         (rev 0)
+++ gnunet/src/gns/test_gns_delegated_lookup.sh 2013-09-23 17:53:18 UTC (rev 
29504)
@@ -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
+

Modified: gnunet/src/gns/test_gns_lookup.conf
===================================================================
--- gnunet/src/gns/test_gns_lookup.conf 2013-09-23 15:43:05 UTC (rev 29503)
+++ gnunet/src/gns/test_gns_lookup.conf 2013-09-23 17:53:18 UTC (rev 29504)
@@ -33,7 +33,7 @@
 PORT = 12092
 
 [arm]
-DEFAULTSERVICES = core dht namestore gns
+DEFAULTSERVICES = core dht namestore
 PORT = 12366
 
 [transport-tcp]
@@ -62,12 +62,6 @@
 #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 @@
 DATABASE = sqlite
 ZONEFILE_DIRECTORY = $SERVICEHOME
 
+[identity]
+EGODIR = egos/
+
 [namestore-sqlite]
 FILENAME = $SERVICEHOME/sqlite-default.db

Modified: gnunet/src/gns/test_gns_lookup.sh
===================================================================
--- gnunet/src/gns/test_gns_lookup.sh   2013-09-23 15:43:05 UTC (rev 29503)
+++ gnunet/src/gns/test_gns_lookup.sh   2013-09-23 17:53:18 UTC (rev 29504)
@@ -4,10 +4,9 @@
 
 gnunet-arm -s -c test_gns_lookup.conf
 
-gnunet-identity -C testego -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-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 @@
 
 if [ "$RES_IP" == "$TEST_IP" ]
 then
-  echo "OK"
   exit 0
 else
-  echo "Result $RES_IP NOTOK"
   exit 1
 fi