diff --git a/test/lib.sh b/test/lib.sh index 436e4313..9b7f8308 100755 --- a/test/lib.sh +++ b/test/lib.sh @@ -43,16 +43,19 @@ fi # Sanity nginx running on systemd platforms if systemctl > /dev/null 2>&1 ; then + # even if systemd exists, nginx may be started in other ways nginxactive=$(systemctl show nginx |grep ActiveState=active) if [ "${WITH_RESTCONF}" = "fcgi" ]; then - if [ -z "$nginxactive" ]; then - echo -e "\e[31m\nwith-restconf=fcgi set but nginx not running, start with systemctl start nginx" + if [ -z "$nginxactive" -a ! -f /var/run/nginx.pid ]; then + echo -e "\e[31m\nwith-restconf=fcgi set but nginx not running, start with:" + echo "systemctl start nginx" echo -e "\e[0m" exit -1 fi else - if [ -n "$nginxactive" ]; then - echo -e "\e[31m\nwith-restconf=fcgi not set but nginx running, stop with systemctl stop nginx" + if [ -n "$nginxactive" -o -f /var/run/nginx.pid ]; then + echo -e "\e[31m\nwith-restconf=fcgi not set but nginx running, stop with:" + echo "systemctl stop nginx" echo -e "\e[0m" exit -1 fi diff --git a/test/test_yang_namespace.sh b/test/test_yang_namespace.sh index 83033a11..38d7891b 100755 --- a/test/test_yang_namespace.sh +++ b/test/test_yang_namespace.sh @@ -68,15 +68,11 @@ if [ $BE -ne 0 ]; then fi new "start backend -s init -f $cfg" - # start new backend - sudo $clixon_backend -s init -f $cfg -D $DBG - if [ $? -ne 0 ]; then - err - fi -fi + start_backend -s init -f $cfg -new "waiting" -wait_backend + new "waiting" + wait_backend +fi if [ $RC -ne 0 ]; then new "kill old restconf daemon" diff --git a/test/vagrant/nginx.sh b/test/vagrant/nginx.sh index 119970d2..0a9dad77 100755 --- a/test/vagrant/nginx.sh +++ b/test/vagrant/nginx.sh @@ -67,6 +67,7 @@ http { } EOF $scpcmd $dir/nginx.conf vagrant@127.0.0.1: +# This is problematic since it does not use systemctl (lib.sh check does) cat<<'EOF' > $dir/startnginx.sh #!/usr/bin/env bash set -x @@ -83,7 +84,9 @@ cat<<'EOF' > $dir/startnginx.sh sudo sh -c ' echo 'nginx_enable="YES"' >> /etc/rc.conf' fi sudo /usr/local/etc/rc.d/nginx restart - else + elif systemctl > /dev/null 2>&1 ; then + sudo systemctl start nginx + else sudo pkill nginx nginxbin=$(sudo which nginx) sudo $nginxbin -c $prefix/etc/nginx/nginx.conf diff --git a/test/vagrant/vagrant.sh b/test/vagrant/vagrant.sh index 080d8168..eb11ca74 100755 --- a/test/vagrant/vagrant.sh +++ b/test/vagrant/vagrant.sh @@ -18,6 +18,7 @@ box=$1 # As defined in https://vagrantcloud.com/search #with_restconf=fcgi : ${with_restconf:=evhtp} +echo "with-restconf:${with_restconf}" VCPUS=1 MEM=1024 @@ -135,6 +136,8 @@ case $release in esac ;; centos) + # enable ipv6 + sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0 # add restconf user: $wwwuser if [ ! $($sshcmd id -u $wwwuser) ]; then $sshcmd sudo useradd -M $wwwuser