Merge branch 'stg-2.409'

[stg.git] / functest / test_admins.sh

diff --git a/functest/test_admins.sh b/functest/test_admins.sh
index b19df2b080d615ab05f7487497061ad6a3b197d9..dae254ba0aa6cb392428c3e973004a0773ef85c2 100755 (executable)
--- a/functest/test_admins.sh
+++ b/functest/test_admins.sh
@@ -6,26 +6,39 @@ BASEPATH=$1
 
 SGCONFPATH="$BASEPATH/stg/projects/sgconf"
 
 
 SGCONFPATH="$BASEPATH/stg/projects/sgconf"
 

+printf "Check initial admin list... "
+

 RES=`"$SGCONFPATH/sgconf" -s localhost -p 5555 -u admin -w 123456 --get-admins`
 
 if [ "$?" != "0" ]
 then
 RES=`"$SGCONFPATH/sgconf" -s localhost -p 5555 -u admin -w 123456 --get-admins`
 
 if [ "$?" != "0" ]
 then

+    printf "Error.\n"

     printf "Failed to get admins list. Result:\n$RES\n"
     exit 0
 fi
 
 LOGINS=`getFields "login" "$RES"`
 
     printf "Failed to get admins list. Result:\n$RES\n"
     exit 0
 fi
 
 LOGINS=`getFields "login" "$RES"`
 

-printf "Logins:\n$LOGINS\n"
-

 NUM=`count "$LOGINS"`
 
 NUM=`count "$LOGINS"`
 

-printf -- "--------\n$NUM\n\n"
+if [ "$NUM" != "1" ]
+then
+    printf "Failed.\n"
+    printf "Admin list should have exactly one entry.\n"
+    printf "Logins:\n$LOGINS\n"
+    printf -- "--------\n$NUM\n\n"
+    exit 0
+fi
+
+printf "Ok.\nCheck updating admin permissions... "

 
 RES=`"$SGCONFPATH/sgconf" -s localhost -p 5555 -u admin -w 123456 --chg-admin admin --priv 111111111`
 
 if [ "$?" != "0" ]
 then
 
 RES=`"$SGCONFPATH/sgconf" -s localhost -p 5555 -u admin -w 123456 --chg-admin admin --priv 111111111`
 
 if [ "$?" != "0" ]
 then

+    printf "Error\n"

     printf "Failed to update admin's priviledges Result:\n$RES\n"
     exit 0
 fi
     printf "Failed to update admin's priviledges Result:\n$RES\n"
     exit 0
 fi

+
+printf "Ok.\n"