X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/768360d78c1b5553974b4d612e30663d561d2994..38f134e6a96c08fdd7d4ed07ca3550e8434d56e9:/functest/test_admins.sh?ds=inline

diff --git a/functest/test_admins.sh b/functest/test_admins.sh
index d82d97bc..9f819147 100755
--- a/functest/test_admins.sh
+++ b/functest/test_admins.sh
@@ -1,43 +1,44 @@
 #!/bin/sh
 
+source `dirname $0`/functions
+
 BASEPATH=$1
 
-SGCONFPATH="$BASEPATH/stg/projects/sgconf"
+SGCONFPATH="$BASEPATH/stg/build/projects/sgconf"
+
+printf "Check initial admin list... "
 
-RES=`"$SGCONFPATH/sgconf" -s localhost -p 5555 -u admin -w 123456 --get-admins`
+RES=`"$SGCONFPATH/sgconf" -s 127.0.0.1 -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
 
-printf "Got admins list:\n"
+LOGINS=`getFields "login" "$RES"`
 
-LOGINS=""
-OLDIFS=$IFS
-IFS=$(printf "\n")
-for LINE in $RES
-do
-    printf -- "$LINE\n"
-    LOGIN=`printf "$LINE" | grep login`
-    if [ "$?" == "0" ]
-    then
-        LOGINS="$LOGINS\n"`printf "$LOGIN" | cut -d: -f2 | sed -e 's/^ *//' -e 's/ *$//'`
-    fi
-done
-IFS=$OLDIFS
+NUM=`count "$LOGINS"`
 
-printf "Logins:\n$LOGINS\n"
-
-NUM=`printf "$LOGINS" | wc -l`
+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 -- "--------\n$NUM\n\n"
+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
+    printf "Error\n"
     printf "Failed to update admin's priviledges Result:\n$RES\n"
     exit 0
 fi
+
+printf "Ok.\n"