[GNUnet-SVN] r30576 - gnunet/src/gns

[gnunet]

Author: grothoff
Date: 2013-11-06 21:30:43 +0100 (Wed, 06 Nov 2013)
New Revision: 30576

Added:
   gnunet/src/gns/test_gns_gns2dns_lookup.sh
Removed:
   gnunet/src/gns/test_gns_ns_lookup.sh
Modified:
   gnunet/src/gns/Makefile.am
Log:
-rename testcase to match record type

Modified: gnunet/src/gns/Makefile.am
===================================================================
--- gnunet/src/gns/Makefile.am  2013-11-06 20:30:18 UTC (rev 30575)
+++ gnunet/src/gns/Makefile.am  2013-11-06 20:30:43 UTC (rev 30576)
@@ -226,7 +226,7 @@
   test_gns_ipv6_lookup.sh\
   test_gns_txt_lookup.sh\
   test_gns_mx_lookup.sh \
-  test_gns_ns_lookup.sh \
+  test_gns_gns2dns_lookup.sh \
   test_gns_dht_lookup.sh\
   test_gns_pseu_shorten.sh\
   test_gns_plus_lookup.sh\

Copied: gnunet/src/gns/test_gns_gns2dns_lookup.sh (from rev 30575, 
gnunet/src/gns/test_gns_ns_lookup.sh)
===================================================================
--- gnunet/src/gns/test_gns_gns2dns_lookup.sh                           (rev 0)
+++ gnunet/src/gns/test_gns_gns2dns_lookup.sh   2013-11-06 20:30:43 UTC (rev 
30576)
@@ -0,0 +1,80 @@
+#!/bin/bash
+trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
+rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
+# IP address of 'uk.gnunet.org'
+TEST_IP_ALT2="81.187.252.184"
+# IP address of 'www.gnunet.org'
+TEST_IP="131.159.74.67"
+# IPv6 address of 'gnunet.org'
+TEST_IP6="2001:4ca0:2001:42:225:90ff:fe6b:d60"
+# permissive DNS resolver we will use for the test
+TEST_IP_GNS2DNS="8.8.8.8"
+
+# main label used during resolution
+TEST_RECORD_NAME="homepage"
+# various names we will use for resolution
+TEST_DOMAIN="www.${TEST_RECORD_NAME}.gnu"
+TEST_DOMAIN_ALT="${TEST_RECORD_NAME}.gnu"
+TEST_DOMAIN_ALT2="uk.${TEST_RECORD_NAME}.gnu"
+
+# helper record for pointing to the DNS resolver
+TEST_RESOLVER_LABEL="resolver"
+# GNS2DNS record value: delegate to DNS domain 'gnunet.org'
+# using the TEST_RESOLVER_LABEL DNS server for resolution
+TEST_RECORD_GNS2DNS="address@hidden"
+
+gnunet-arm -s -c test_gns_lookup.conf
+gnunet-identity -C testego -c test_gns_lookup.conf
+
+# set IP address for DNS resolver for resolving in gnunet.org domain
+gnunet-namestore -p -z testego -a -n $TEST_RESOLVER_LABEL -t A -V 
$TEST_IP_GNS2DNS -e never -c test_gns_lookup.conf
+# map 'homepage.gnu' to 'gnunet.org' in DNS
+gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME -t GNS2DNS -V 
$TEST_RECORD_GNS2DNS -e never -c test_gns_lookup.conf
+
+# lookup 'www.gnunet.org', IPv4
+RES_IP=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN -t A -c 
test_gns_lookup.conf)
+# lookup 'www.gnunet.org', IPv6
+RES_IP6=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN -t AAAA -c 
test_gns_lookup.conf)
+# lookup 'gnunet.org', IPv4
+RES_IP_ALT=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN_ALT -t A -c 
test_gns_lookup.conf)
+# lookup 'uk.gnunet.org', IPv4
+RES_IP_ALT2=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN_ALT2 -t A 
-c test_gns_lookup.conf)
+
+# clean up
+gnunet-namestore -z testego -d -n $TEST_RESOLVER_LABEL -t A -V 
$TEST_IP_GNS2DNS -e never -c test_gns_lookup.conf
+gnunet-namestore -z testego -d -n $TEST_RECORD_NAME -t GNS2DNS -V 
$TEST_RECORD_GNS2DNS -e never -c test_gns_lookup.conf
+gnunet-identity -D testego -c test_gns_lookup.conf
+gnunet-arm -e -c test_gns_lookup.conf
+ret=0
+if [ "$RES_IP" == "$TEST_IP" ]
+then
+  echo "PASS: Resolved $TEST_DOMAIN to $RES_IP."
+else
+  echo "Failed to resolve to proper IP for $TEST_DOMAIN, got $RES_IP, wanted 
$TEST_IP."
+  ret=1
+fi
+
+if [ "$RES_IP6" == "$TEST_IP6" ]
+then
+  echo "PASS: Resolved $TEST_DOMAIN to $RES_IP6."
+else
+  echo "Failed to resolve to proper IP for $TEST_DOMAIN, got $RES_IP6, wanted 
$TEST_IP6."
+  ret=1
+fi
+
+if [ "$RES_IP_ALT" == "$TEST_IP" ]
+then
+  echo "PASS: Resolved $TEST_DOMAIN_ALT to $RES_IP_ALT."
+else
+  echo "Failed to resolve to proper IP for $TEST_DOMAIN_ALT, got $RES_IP_ALT, 
wanted $TEST_IP."
+  ret=1
+fi
+
+if [ "$RES_IP_ALT2" == "$TEST_IP_ALT2" ]
+then
+  echo "PASS: Resolved $TEST_DOMAIN_ALT2 to $RES_IP_ALT2."
+else
+  echo "Failed to resolve to proper IP for $TEST_DOMAIN_ALT2, got 
$RES_IP_ALT2, wanted $TEST_IP_ALT2."
+  ret=1
+fi
+exit $ret

Deleted: gnunet/src/gns/test_gns_ns_lookup.sh
===================================================================
--- gnunet/src/gns/test_gns_ns_lookup.sh        2013-11-06 20:30:18 UTC (rev 
30575)
+++ gnunet/src/gns/test_gns_ns_lookup.sh        2013-11-06 20:30:43 UTC (rev 
30576)
@@ -1,80 +0,0 @@
-#!/bin/bash
-trap "gnunet-arm -e -c test_gns_lookup.conf" SIGINT
-rm -r `gnunet-config -c test_gns_lookup.conf -s PATHS -o GNUNET_HOME -f`
-# IP address of 'uk.gnunet.org'
-TEST_IP_ALT2="81.187.252.184"
-# IP address of 'www.gnunet.org'
-TEST_IP="131.159.74.67"
-# IPv6 address of 'gnunet.org'
-TEST_IP6="2001:4ca0:2001:42:225:90ff:fe6b:d60"
-# permissive DNS resolver we will use for the test
-TEST_IP_GNS2DNS="8.8.8.8"
-
-# main label used during resolution
-TEST_RECORD_NAME="homepage"
-# various names we will use for resolution
-TEST_DOMAIN="www.${TEST_RECORD_NAME}.gnu"
-TEST_DOMAIN_ALT="${TEST_RECORD_NAME}.gnu"
-TEST_DOMAIN_ALT2="uk.${TEST_RECORD_NAME}.gnu"
-
-# helper record for pointing to the DNS resolver
-TEST_RESOLVER_LABEL="resolver"
-# GNS2DNS record value: delegate to DNS domain 'gnunet.org'
-# using the TEST_RESOLVER_LABEL DNS server for resolution
-TEST_RECORD_GNS2DNS="address@hidden"
-
-gnunet-arm -s -c test_gns_lookup.conf
-gnunet-identity -C testego -c test_gns_lookup.conf
-
-# set IP address for DNS resolver for resolving in gnunet.org domain
-gnunet-namestore -p -z testego -a -n $TEST_RESOLVER_LABEL -t A -V 
$TEST_IP_GNS2DNS -e never -c test_gns_lookup.conf
-# map 'homepage.gnu' to 'gnunet.org' in DNS
-gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME -t GNS2DNS -V 
$TEST_RECORD_GNS2DNS -e never -c test_gns_lookup.conf
-
-# lookup 'www.gnunet.org', IPv4
-RES_IP=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN -t A -c 
test_gns_lookup.conf)
-# lookup 'www.gnunet.org', IPv6
-RES_IP6=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN -t AAAA -c 
test_gns_lookup.conf)
-# lookup 'gnunet.org', IPv4
-RES_IP_ALT=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN_ALT -t A -c 
test_gns_lookup.conf)
-# lookup 'uk.gnunet.org', IPv4
-RES_IP_ALT2=$(timeout 5 gnunet-gns --raw -z testego -u $TEST_DOMAIN_ALT2 -t A 
-c test_gns_lookup.conf)
-
-# clean up
-gnunet-namestore -z testego -d -n $TEST_RESOLVER_LABEL -t A -V 
$TEST_IP_GNS2DNS -e never -c test_gns_lookup.conf
-gnunet-namestore -z testego -d -n $TEST_RECORD_NAME -t GNS2DNS -V 
$TEST_RECORD_GNS2DNS -e never -c test_gns_lookup.conf
-gnunet-identity -D testego -c test_gns_lookup.conf
-gnunet-arm -e -c test_gns_lookup.conf
-ret=0
-if [ "$RES_IP" == "$TEST_IP" ]
-then
-  echo "PASS: Resolved $TEST_DOMAIN to $RES_IP."
-else
-  echo "Failed to resolve to proper IP for $TEST_DOMAIN, got $RES_IP, wanted 
$TEST_IP."
-  ret=1
-fi
-
-if [ "$RES_IP6" == "$TEST_IP6" ]
-then
-  echo "PASS: Resolved $TEST_DOMAIN to $RES_IP6."
-else
-  echo "Failed to resolve to proper IP for $TEST_DOMAIN, got $RES_IP6, wanted 
$TEST_IP6."
-  ret=1
-fi
-
-if [ "$RES_IP_ALT" == "$TEST_IP" ]
-then
-  echo "PASS: Resolved $TEST_DOMAIN_ALT to $RES_IP_ALT."
-else
-  echo "Failed to resolve to proper IP for $TEST_DOMAIN_ALT, got $RES_IP_ALT, 
wanted $TEST_IP."
-  ret=1
-fi
-
-if [ "$RES_IP_ALT2" == "$TEST_IP_ALT2" ]
-then
-  echo "PASS: Resolved $TEST_DOMAIN_ALT2 to $RES_IP_ALT2."
-else
-  echo "Failed to resolve to proper IP for $TEST_DOMAIN_ALT2, got 
$RES_IP_ALT2, wanted $TEST_IP_ALT2."
-  ret=1
-fi
-exit $ret