disable IPv6 restconf test by default

This commit is contained in:
Olof hagsand 2020-11-15 17:00:35 +01:00
parent 6eb18da5e9
commit a5d56f1cb7
2 changed files with 10 additions and 3 deletions

View file

@ -42,8 +42,7 @@ if [ -f ./config.sh ]; then
fi
# Sanity nginx running on systemd platforms
# ./lib.sh: line 45: systemctl: command not found
if systemctl > /dev/null; then
if systemctl > /dev/null 2>&1 ; then
nginxactive=$(systemctl show nginx |grep ActiveState=active)
if [ "${WITH_RESTCONF}" = "fcgi" ]; then
if [ -z "$nginxactive" ]; then

View file

@ -10,6 +10,7 @@
# - evhtp: generate self-signed server certs
# (3) IPv4/IPv6 (only loopback 127.0.0.1 / ::1)
# - The tests runs through both
# - IPv6 by default disabled since docker does not support it out-of-the box
# (4) local/backend config. Evhtp only
# - The tests runs through both (if compiled with evhtp)
# See also test_restconf2.sh
@ -21,6 +22,9 @@ APPNAME=example
cfg=$dir/conf.xml
# Must explicitly enable IPv6 testing
: ${IPv6:=false}
# Use yang in example
cat <<EOF > $cfg
@ -372,7 +376,11 @@ if [ "${WITH_RESTCONF}" = "evhtp" ]; then
protos="$protos https"
fi
for proto in $protos; do
for addr in 127.0.0.1 "\[::1\]"; do
addrs="127.0.0.1"
if $IPv6 ; then
addrs="$addrs \[::1\]"
fi
for addr in $addrs; do
configs="local"
if [ "${WITH_RESTCONF}" = "evhtp" ]; then
# backend config retrieval only implemented for evhtp