From d4f07f0f01121bc36d1a6121494635ddaea3348a Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 18 Aug 2015 10:22:50 +1000 Subject: [PATCH] use grep/awk rather than xmllint --- bin/tests/system/statistics/tests.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/tests/system/statistics/tests.sh b/bin/tests/system/statistics/tests.sh index 978b2bc35a..6df2c0a507 100644 --- a/bin/tests/system/statistics/tests.sh +++ b/bin/tests/system/statistics/tests.sh @@ -29,17 +29,21 @@ t=0 ret=0 t=`expr $t + 1` echo "I:checking that zones with slash are properly shown in XML output (${t})" -if [ -x ${CURL} -a -x ${XMLLINT} ] ; then +if [ -x ${CURL} ] ; then if ./newstats then ${CURL} http://10.53.0.1:8053/xml/v3 > curl.out.${t} 2>/dev/null || ret=1 - ${XMLLINT} --xpath '//statistics/views/view/zones/zone[@name="32/1.0.0.127-in-addr.example"]' curl.out.${t} > /dev/null 2>&1 || ret=1 + grep '' curl.out.${t} > /dev/null || ret=1 else ${CURL} http://10.53.0.1:8053/xml > curl.out.${t} 2>/dev/null || ret=1 - ${XMLLINT} --xpath '//statistics/views/view/zones/zone/name="32/1.0.0.127-in-addr.example"' curl.out.${t} > /dev/null 2>&1 || ret=1 +awk '// { count=1 ; next } + /32\/1.0.0.127-in-addr.example<\/name>/ && count == 1 { count = 2 ; next} + /IN<\/rdataclass>/ && count == 2 { good = 1 } + {count=0} + END { if (good) exit (0); exit (1) }' curl.out.${t} || ret=1 fi else - echo "I:skipping test as curl and/or xmllint were not found" + echo "I:skipping test as curl was not found" fi if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret`