From dd6144fb73127c6716b973544e48dbbd0bb29a69 Mon Sep 17 00:00:00 2001
From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sat, 11 Oct 2014 01:30:05 +0300
Subject: [PATCH] Beautified test output.

---
 functest/do.sh            | 12 ++++--------
 functest/test.sh          |  9 +++++++--
 functest/test_admins.sh   | 19 ++++++++++++++++---
 functest/test_services.sh | 38 ++++++++++++++++++++++++++------------
 4 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/functest/do.sh b/functest/do.sh
index 277a4b35..a007aa9b 100755
--- a/functest/do.sh
+++ b/functest/do.sh
@@ -35,16 +35,12 @@ then
     printf "Failed.\n"
     exit -1
 else
-    printf "Ok.\nTesting... "
+    printf "Ok.\n"
 fi
+
 ./test.sh "$DIR" # >> "$LOGFILE" 2>&1
-if [ "$?" != "0" ]
-then
-    printf "Failed.\n"
-    exit -1
-else
-    printf "Ok.\nCleaning up... "
-fi
+
+printf "Cleaning up... "
 
 $RM -rf $DIR
 if [ "$?" != "0" ]
diff --git a/functest/test.sh b/functest/test.sh
index 51a06385..333c45e0 100755
--- a/functest/test.sh
+++ b/functest/test.sh
@@ -30,6 +30,8 @@ LOGFILE="$CURPATH/"`date "+%Y-%m-%d-%H%M%S.console.log"`
 
 cd "$STGPATH"
 
+printf "Starting Stargazer... "
+
 "$STGPATH/stargazer" "$STGPATH" >> "$LOGFILE" 2>&1 &
 
 COUNT=""
@@ -50,12 +52,15 @@ do
 done
 
 PID=`cat "$STGPATH/stargazer.pid"`
-printf "\nStarted with pid $PID\n"
+printf "Started with pid $PID\n"
 
+printf "\nTesting admins:\n"
 "$CURPATH/test_admins.sh" "$BASEPATH"
+printf "\nTesting services:\n"
 "$CURPATH/test_services.sh" "$BASEPATH"
+printf "\n"
 
-printf "Stopping...\n"
+printf "Stopping... "
 kill $PID
 
 COUNT=""
diff --git a/functest/test_admins.sh b/functest/test_admins.sh
index b19df2b0..dae254ba 100755
--- a/functest/test_admins.sh
+++ b/functest/test_admins.sh
@@ -6,26 +6,39 @@ BASEPATH=$1
 
 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
+    printf "Error.\n"
     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"`
 
-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
+    printf "Error\n"
     printf "Failed to update admin's priviledges Result:\n$RES\n"
     exit 0
 fi
+
+printf "Ok.\n"
diff --git a/functest/test_services.sh b/functest/test_services.sh
index 3bc397ae..0b8a2a8c 100755
--- a/functest/test_services.sh
+++ b/functest/test_services.sh
@@ -6,84 +6,98 @@ BASEPATH=$1
 
 SGCONFPATH="$BASEPATH/stg/projects/sgconf"
 
+printf "Check initial service list... "
+
 RES=`"$SGCONFPATH/sgconf" -s localhost -p 5555 -u admin -w 123456 --get-services`
 
 if [ "$?" != "0" ]
 then
+    printf "Error.\n"
     printf "Failed to get services list. Result:\n$RES\n"
     exit 0
 fi
 
 NAMES=`getFields "name" "$RES"`
 
-printf "Names:\n$NAMES\n"
-
 NUM=`count "$NAMES"`
 
-printf -- "--------\n$NUM\n\n"
-
 if [ "$NUM" != "0" ]
 then
+    printf "Failed.\n"
     printf "Services list should be empty.\n"
+    printf "Names:\n$NAMES\n"
+    printf -- "--------\n$NUM\n\n"
     exit 0
 fi
 
+printf "Ok.\nCheck adding services... "
+
 RES=`"$SGCONFPATH/sgconf" -s localhost -p 5555 -u admin -w 123456 --add-service test`
 
 if [ "$?" != "0" ]
 then
+    printf "Error.\n"
     printf "Failed to add new service. Result:\n$RES\n"
     exit 0
 fi
 
+printf "Ok.\nCheck new service list... "
+
 RES=`"$SGCONFPATH/sgconf" -s localhost -p 5555 -u admin -w 123456 --get-services`
 
 if [ "$?" != "0" ]
 then
+    printf "Error.\n"
     printf "Failed to get services list. Result:\n$RES\n"
     exit 0
 fi
 
 NAMES=`getFields "name" "$RES"`
 
-printf "Names:\n$NAMES\n"
-
 NUM=`count "$NAMES"`
 
-printf -- "--------\n$NUM\n\n"
-
 if [ "$NUM" != "1" ]
 then
+    printf "Failed.\n"
     printf "Services list should have exactly one entry.\n"
+    printf "Names:\n$NAMES\n"
+    printf -- "--------\n$NUM\n\n"
     exit 0
 fi
 
+printf "Ok.\nCheck deletion exisiting service... "
+
 RES=`"$SGCONFPATH/sgconf" -s localhost -p 5555 -u admin -w 123456 --del-service test`
 
 if [ "$?" != "0" ]
 then
+    printf "Error.\n"
     printf "Failed to delete a service. Result:\n$RES\n"
     exit 0
 fi
 
+printf "Ok.\nCheck new service list... "
+
 RES=`"$SGCONFPATH/sgconf" -s localhost -p 5555 -u admin -w 123456 --get-services`
 
 if [ "$?" != "0" ]
 then
+    printf "Error.\n"
     printf "Failed to get services list. Result:\n$RES\n"
     exit 0
 fi
 
 NAMES=`getFields "name" "$RES"`
 
-printf "Names:\n$NAMES\n"
-
 NUM=`count "$NAMES"`
 
-printf -- "--------\n$NUM\n\n"
-
 if [ "$NUM" != "0" ]
 then
+    printf "Failed.\n"
     printf "Services list should be empty.\n"
+    printf "Names:\n$NAMES\n"
+    printf -- "--------\n$NUM\n\n"
     exit 0
 fi
+
+printf "Ok.\n"
-- 
2.43.2