Commit 3d512a7e authored by Mark Andrews's avatar Mark Andrews
Browse files

Merge branch '926-statschannel-system-tests-fails-json-only-no-libxml' into 'master'

Resolve "statschannel system tests fails json only (no libxml)"

Closes #926

See merge request !1614
parents 8b637a1d 5bc06a0a
Pipeline #11283 passed with stages
in 1 minute
5176. [tests] Remove a dependency on libxml in statschannel system
test. [GL #926]
5175. [bug] Fixed a problem with file input in dnssec-keymgr,
dnssec-coverage and dnssec-checkds when using
python3. [GL #882]
......@@ -81,7 +84,7 @@
- Zone signing and DNSKEY maintenance events are
now logged to the "dnssec" category
- Messages are now logged when DNSSEC keys are
pubished, activated, inactivated, deleted,
published, activated, inactivated, deleted,
or revoked.
[GL #714]
 
......@@ -298,8 +301,8 @@
5091. [func] Two new global and per-view options min-cache-ttl
and min-ncache-ttl [GL #613]
 
5090. [bug] dig and mdig failed to properly preparse dash value
pairs when value was a seperate argument and started
5090. [bug] dig and mdig failed to properly pre-parse dash value
pairs when value was a separate argument and started
with a dash. [GL #584]
 
5089. [bug] Restore localhost fallback in dig and host which is
......@@ -365,7 +368,7 @@
5072. [bug] Add unit tests for isc_buffer_copyregion() and fix its
behavior for auto-reallocated buffers. [GL #644]
 
5071. [bug] Comparision of NXT records was broken. [GL #631]
5071. [bug] Comparison of NXT records was broken. [GL #631]
 
5070. [bug] Record types which support a empty rdata field were
not handling the empty rdata field case. [GL #638]
......@@ -384,7 +387,7 @@
 
5065. [bug] Only set IPV6_USE_MIN_MTU on IPv6. [GL #553]
 
5064. [test] Initalize TZ environment variable before calling
5064. [test] Initialize TZ environment variable before calling
dns_test_begin in dnstap_test. [GL #624]
 
5063. [test] In statschannel test try a few times before failing
......@@ -610,7 +613,7 @@
5001. [bug] Fix refcount errors on error paths. [GL !563]
 
5000. [bug] named_server_servestale() could leave the server in
exclusive mode if an error occured. [GL #441]
exclusive mode if an error occurred. [GL #441]
 
4999. [cleanup] Remove custom printf implementation in lib/isc/print.c.
[GL #261]
......
......@@ -204,13 +204,15 @@ for i in 1 2 3 4 5; do
if [ "$HAVEXMLSTATS" ];
then
URL=http://10.53.0.2:${EXTRAPORT1}/xml/v3/server
filter_str='s#<current-time>.*</current-time>##g'
else
URL=http://10.53.0.2:${EXTRAPORT1}/json/v1/server
filter_str='s#"current-time.*",##g'
fi
$CURL -D regular.headers $URL 2>/dev/null | \
sed -e "s#<current-time>.*</current-time>##g" > regular.out
sed -e "$filter_str" > regular.out
$CURL -D compressed.headers --compressed $URL 2>/dev/null | \
sed -e "s#<current-time>.*</current-time>##g" > compressed.out
sed -e "$filter_str" > compressed.out
diff regular.out compressed.out >/dev/null || ret=1
if [ $ret != 0 ]; then
echo_i "failed on try $i, probably a timing issue, trying again"
......
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