[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30693 - gnunet/src/gns
From: |
gnunet |
Subject: |
[GNUnet-SVN] r30693 - gnunet/src/gns |
Date: |
Thu, 14 Nov 2013 14:22:32 +0100 |
Author: wachs
Date: 2013-11-14 14:22:32 +0100 (Thu, 14 Nov 2013)
New Revision: 30693
Added:
gnunet/src/gns/test_gns_nick_shorten.sh
Modified:
gnunet/src/gns/Makefile.am
Log:
renaming and modifications to the shorten test
- renamed to nick
- added identity
test fail since names are obtained from namecache instead of DHT
Modified: gnunet/src/gns/Makefile.am
===================================================================
--- gnunet/src/gns/Makefile.am 2013-11-14 13:18:49 UTC (rev 30692)
+++ gnunet/src/gns/Makefile.am 2013-11-14 13:22:32 UTC (rev 30693)
@@ -228,7 +228,7 @@
test_gns_mx_lookup.sh \
test_gns_gns2dns_lookup.sh \
test_gns_dht_lookup.sh\
- test_gns_pseu_shorten.sh\
+ test_gns_nick_shorten.sh\
test_gns_plus_lookup.sh\
test_gns_zkey_lookup.sh\
test_gns_rel_expiration.sh\
Copied: gnunet/src/gns/test_gns_nick_shorten.sh (from rev 30678,
gnunet/src/gns/test_gns_pseu_shorten.sh)
===================================================================
--- gnunet/src/gns/test_gns_nick_shorten.sh (rev 0)
+++ gnunet/src/gns/test_gns_nick_shorten.sh 2013-11-14 13:22:32 UTC (rev
30693)
@@ -0,0 +1,77 @@
+#!/bin/bash
+trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
+which timeout &> /dev/null && DO_TIMEOUT="timeout 5"
+
+# This test tests shortening functionality based on NICK records:
+#
+# zone "delegatedego": Alice's zone
+# zone "testego": Local zone with delegation to alice
+
+# Deleting home directory from previous runs
+rm -rf `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
+TEST_IP="127.0.0.1"
+TEST_IP="127.0.0.2"
+TEST_NICK_EGO="ego"
+TEST_NICK_DELEGATED="alice"
+TEST_NAME="www.mybestfriendalice.gnu"
+TEST_NAME_SHORT="www.alice.short.gnu"
+
+# Start gnunet
+gnunet-arm -s -c test_gns_lookup.conf
+
+DELEGATED_PKEY=$(gnunet-identity -d -c test_gns_lookup.conf | grep
delegatedego | awk '{print $3}')
+
+# Create initial identities: short-zone, delegated-zone, testego
+gnunet-identity -c test_gns_lookup.conf -d
+gnunet-identity -C short-zone -c test_gns_lookup.conf
+gnunet-identity -C delegatedego -c test_gns_lookup.conf
+gnunet-identity -e short-zone -s gns-short -c test_gns_lookup.conf
+gnunet-identity -C testego -c test_gns_lookup.conf
+
+# We should set NICKs here
+gnunet-namestore -z testego -i $TEST_NICK_EGO -c test_gns_lookup.conf
+gnunet-namestore -z delegatedego -i $TEST_NICK_DELEGATED -c
test_gns_lookup.conf
+
+DELEGATED_PKEY=$(gnunet-identity -d -c test_gns_lookup.conf | grep
delegatedego | awk '{print $3}')
+SHORT=$(gnunet-identity -c test_gns_lookup.conf -d | grep short-zone | awk
'{print $3}')
+
+# Delegate the name "mybestfriendalice" to alice
+gnunet-namestore -p -z testego -a -n mybestfriendalice -t PKEY -V
$DELEGATED_PKEY -e never -c test_gns_lookup.conf
+
+# Delegate the name "short" to shortenzone
+gnunet-namestore -p -z testego -a -n short -t PKEY -V $SHORT -e never -c
test_gns_lookup.conf
+
+gnunet-namestore -p -z testego -a -n mail -t A -V $TEST_IP -e never -c
test_gns_lookup.conf
+
+# Adding label www in Alice's delegatedego zone
+gnunet-namestore -p -z delegatedego -a -n www -t A -V $TEST_IP -e never -c
test_gns_lookup.conf
+
+# Force start of GNS
+gnunet-arm -c test_gns_lookup.conf -i gns
+# need to sleep here, to give PSEU record chance to be copied to DHT
+sleep 1
+RES_IP=`$DO_TIMEOUT gnunet-gns --raw -z testego -u $TEST_NAME -t A -c
test_gns_lookup.conf`
+
+# need to sleep here, as shortening happens asynchronously...
+sleep 1
+RES_IP_PSEU=`$DO_TIMEOUT gnunet-gns --raw -z testego -u www.alice.short.gnu -t
A -c test_gns_lookup.conf`
+gnunet-namestore -z testego -d -n mybestfriendalice -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
+ echo "PASS: Resolved $TEST_NAME properly to $RES_IP."
+else
+ echo "FAIL: Could not resolve $TEST_NAME to proper IP, got $RES_IP."
+ exit 1
+fi
+
+if [ "$RES_IP_PSEU" == "$TEST_IP" ]
+then
+ echo "PASS: Resolved $TEST_NAME_SHORT properly to $RES_IP."
+ exit 0
+else
+ echo "FAIL: Could not resolve $TEST_NAME_SHORT to proper IP, got
$RES_IP_PSEU."
+ exit 1
\ No newline at end of file
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30693 - gnunet/src/gns,
gnunet <=