Fixed: [(CLI) the description of a used grouping is shown instead of the encapsulating container #124](https://github.com/clicon/clixon/issues/124)

test/lib.sh

@@ -297,11 +297,16 @@ wait_restconf(){
     fi
 }
 
-# Increment test number and print a nice string
-new(){
+endtest()
+{
     if [ $valgrindtest -eq 1 ]; then 
 	checkvalgrind
     fi
+}
+
+# Increment test number and print a nice string
+new(){
+    endtest # finalize previous test
     testnr=`expr $testnr + 1`
     testi=`expr $testi + 1`
     testname=$1

test/test_feature.sh

@@ -303,4 +303,6 @@ if [ $BE -ne 0 ]; then
     stop_backend -f $cfg
 fi
 
+endtest
+
 rm -rf $dir

test/test_identity.sh

@@ -321,16 +321,16 @@ if [ $RC -ne 0 ]; then
 fi
 
 if [ $BE -eq 0 ]; then
-    exit # BE
+    new "Kill backend"
+    # Check if premature kill
+    pid=$(pgrep -u root -f clixon_backend)
+    if [ -z "$pid" ]; then
+	err "backend already dead"
+    fi
+    # kill backend
+    stop_backend -f $cfg
 fi
 
-new "Kill backend"
-# Check if premature kill
-pid=$(pgrep -u root -f clixon_backend)
-if [ -z "$pid" ]; then
-    err "backend already dead"
-fi
-# kill backend
-stop_backend -f $cfg
+endtest
 
 rm -rf $dir

test/test_insert.sh

@@ -214,7 +214,10 @@ testrun "$x0" "<e>32</e>"
 new "adv list add leaf-list"
 testrun "$x0" "<e>32</e>"
 
+endtest
+
 rm -rf $dir
 
 # unset conditional parameters 
 unset clixon_util_xml_mod
+

test/test_nacm_default.sh

@@ -225,6 +225,8 @@ for db in startup init; do
 
 done
 
+endtest
+
 rm -rf $dir
 
 # unset conditional parameters 

test/test_nacm_recovery.sh

@@ -223,4 +223,6 @@ RECOVERY=_recovery
 new "cred: $CRED realuser:$REALUSER pseudo:$PSEUDO recovery:$RECOVERY"
 testrun $CRED $REALUSER $PSEUDO $RECOVERY false false
 
+endtest
+
 rm -rf $dir