fixed tests after updates

test/test_perf_state_only.sh

@@ -201,8 +201,9 @@ fi
 
 rm -rf $dir
 
-# Define default restconfig config: RESTCONFIG
-restconf_config none
+# Set by restconf_config
+unset RESTCONFIG
+
 # unset conditional parameters 
 unset format
 unset perfnr

test/test_restconf.sh

@@ -31,7 +31,7 @@ if [ -d ${TOP_SRCDIR}/example/main/$y ]; then
 else
     cp /usr/local/share/clixon/$y $dir/
 fi
-y=clixon-restconf@2020-10-30.yang
+y=clixon-restconf@2020-12-30.yang
 if [ -d ${TOP_SRCDIR}/yang/clixon ]; then 
     cp ${TOP_SRCDIR}/yang/clixon/$y $dir/
 else

test/test_restconf_netns.sh

@@ -8,7 +8,7 @@
 # Magic line must be first in script (see README.md)
 s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi
 
-# Skip it other than evhtp
+# Skip if other than evhtp
 if [ "${WITH_RESTCONF}" != "evhtp" ]; then
     if [ "$s" = $0 ]; then exit 0; else return 0; fi # skip
 fi
@@ -18,6 +18,14 @@ if [ $valgrindtest -eq 3 ]; then
     if [ "$s" = $0 ]; then exit 0; else return 0; fi # skip
 fi
 
+# Check if ip netns is implemented (Alpine does not have it)
+ip netns 2> /dev/null
+if [ $? -ne 0 ]; then
+    echo "...ip netns does not work"
+    if [ "$s" = $0 ]; then exit 0; else return 0; fi # skip
+fi
+
+
 APPNAME=example
 
 cfg=$dir/conf.xml

test/test_restconf_patch.sh

@@ -3,7 +3,6 @@
 # Use nacm module in example/main/example_restconf.c hardcoded to
 # andy:bar and wilma:bar
 
-
 # Magic line must be first in script (see README.md)
 s="$_" ; . ./lib.sh || if [ "$s" = $0 ]; then exit 0; else return 0; fi