From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 6 Nov 2013 21:06:17 +0000 (+0000)
Subject: -allow tests to pass if system is offline
X-Git-Tag: initial-import-from-subversion-38251~6220
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=50c0d1710d77f3224c32dac21d5d01cc3c2122ec;p=oweals%2Fgnunet.git

-allow tests to pass if system is offline
---

diff --git a/src/gns/test_gns_gns2dns_lookup.sh b/src/gns/test_gns_gns2dns_lookup.sh
index fe5e2132d..5bd33221a 100755
--- a/src/gns/test_gns_gns2dns_lookup.sh
+++ b/src/gns/test_gns_gns2dns_lookup.sh
@@ -17,6 +17,12 @@ TEST_DOMAIN="www.${TEST_RECORD_NAME}.gnu"
 TEST_DOMAIN_ALT="${TEST_RECORD_NAME}.gnu"
 TEST_DOMAIN_ALT2="uk.${TEST_RECORD_NAME}.gnu"
 
+if ! nslookup gnunet.org $TEST_IP_GNS2DNS &> /dev/null
+then
+  echo "Cannot reach DNS, skipping test"
+  exit 0
+fi
+
 # helper record for pointing to the DNS resolver
 TEST_RESOLVER_LABEL="resolver"
 # GNS2DNS record value: delegate to DNS domain 'gnunet.org'
diff --git a/src/gns/test_gns_soa_lookup.sh b/src/gns/test_gns_soa_lookup.sh
index 0709bb139..526093c71 100755
--- a/src/gns/test_gns_soa_lookup.sh
+++ b/src/gns/test_gns_soa_lookup.sh
@@ -2,9 +2,17 @@
 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`
 TEST_DOMAIN="homepage.gnu"
+# some public DNS resolver we can use
 TEST_IP_GNS2DNS="184.172.157.218"
 TEST_RECORD_NAME="homepage"
 TEST_RECORD_GNS2DNS="gnunet.org"
+
+if ! nslookup $TEST_RECORD_GNS2DNS $TEST_IP_GNS2DNS &> /dev/null
+then
+  echo "Cannot reach DNS, skipping test"
+  exit 0
+fi
+
 gnunet-arm -s -c test_gns_lookup.conf
 gnunet-identity -C testego -c test_gns_lookup.conf
 gnunet-namestore -p -z testego -a -n $TEST_RECORD_NAME -t GNS2DNS -V ${TEST_RECORD_GNS2DNS}@${TEST_IP_GNS2DNS} -e never -c test_gns_lookup.conf