From 963cdcfe33adfb00c18bbcbf2f93ff363d27fa01 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 11 Jan 2019 22:20:31 +0100 Subject: fix testcases, do not skip needlessly (typos) --- src/gns/test_gns_gns2dns_cname_lookup.sh | 7 +++---- src/gns/test_gns_gns2dns_lookup.sh | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src/gns') diff --git a/src/gns/test_gns_gns2dns_cname_lookup.sh b/src/gns/test_gns_gns2dns_cname_lookup.sh index 17196f820..c07905d83 100755 --- a/src/gns/test_gns_gns2dns_cname_lookup.sh +++ b/src/gns/test_gns_gns2dns_cname_lookup.sh @@ -45,11 +45,10 @@ TEST_DOMAIN="www.${TEST_RECORD_NAME}.$MY_EGO" which timeout &> /dev/null && DO_TIMEOUT="timeout 15" - gnunet-arm -s -c test_gns_lookup.conf - -echo $OUT | grep $TEST_IP - > /dev/null || { gnunet-arm -e -c test_gns_lookup.conf ; echo "IPv4 for gnunet.org not found, skipping test"; exit 77; } -echo $OUT | grep $TEST6_IP - > /dev/null || { gnunet-arm -e -c test_gns_lookup.conf ; echo "IPv6 for gnunet.org not found, skipping test"; exit 77; } +OUT=`$DO_TIMEOUT gnunet-resolver -c test_gns_lookup.conf gnunet.org` +echo $OUT | grep $TEST_IP - > /dev/null || { gnunet-arm -e -c test_gns_lookup.conf ; echo "IPv4 for gnunet.org not found ($OUT), skipping test"; exit 77; } +echo $OUT | grep $TEST_IP6 - > /dev/null || { gnunet-arm -e -c test_gns_lookup.conf ; echo "IPv6 for gnunet.org not found ($OUT), skipping test"; exit 77; } gnunet-identity -C $MY_EGO -c test_gns_lookup.conf diff --git a/src/gns/test_gns_gns2dns_lookup.sh b/src/gns/test_gns_gns2dns_lookup.sh index 431f01086..24fb36b9d 100755 --- a/src/gns/test_gns_gns2dns_lookup.sh +++ b/src/gns/test_gns_gns2dns_lookup.sh @@ -50,8 +50,8 @@ which timeout &> /dev/null && DO_TIMEOUT="timeout 15" gnunet-arm -s -c test_gns_lookup.conf OUT=`$DO_TIMEOUT gnunet-resolver -c test_gns_lookup.conf gnunet.org` -echo $OUT | grep $TEST_IP - > /dev/null || { gnunet-arm -e -c test_gns_lookup.conf ; echo "IPv4 for gnunet.org not found, skipping test"; exit 77; } -echo $OUT | grep $TEST6_IP - > /dev/null || { gnunet-arm -e -c test_gns_lookup.conf ; echo "IPv6 for gnunet.org not found, skipping test"; exit 77; } +echo $OUT | grep $TEST_IP - > /dev/null || { gnunet-arm -e -c test_gns_lookup.conf ; echo "IPv4 for gnunet.org not found ($OUT), skipping test"; exit 77; } +echo $OUT | grep $TEST_IP6 - > /dev/null || { gnunet-arm -e -c test_gns_lookup.conf ; echo "IPv6 for gnunet.org not found ($OUT), skipping test"; exit 77; } -- cgit v1.2.3