Commit 486c7630 authored by Mark Andrews's avatar Mark Andrews
Browse files

use grep rather than xmllint

parent 503ffdad
...@@ -121,11 +121,11 @@ n=`expr $n + 1` ...@@ -121,11 +121,11 @@ n=`expr $n + 1`
ret=0 ret=0
n=`expr $n + 1` n=`expr $n + 1`
echo "I:checking that zones with slash are properly shown in XML output ($n)" echo "I:checking that zones with slash are properly shown in XML output ($n)"
if [ -x ${CURL} -a -x ${XMLLINT} ] ; then if [ -x ${CURL} ] ; then
${CURL} http://10.53.0.1:8053/xml/v3/zones > curl.out.${t} 2>/dev/null || ret=1 ${CURL} http://10.53.0.1:8053/xml/v3/zones > 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 '<zone name="32/1.0.0.127-in-addr.example" rdataclass="IN">' curl.out.${t} > /dev/null || ret=1
else else
echo "I:skipping test as curl and/or xmllint were not found" echo "I:skipping test as curl was not found"
fi fi
if [ $ret != 0 ]; then echo "I:failed"; fi if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret` status=`expr $status + $ret`
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment