Use common functions in admin tests and service tests.

diff --git a/functest/test_admins.sh b/functest/test_admins.sh
index d82d97bcb596c73f768a04c682524131a1d72954..b19df2b080d615ab05f7487497061ad6a3b197d9 100755 (executable)
--- a/functest/test_admins.sh
+++ b/functest/test_admins.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
 #!/bin/sh
 

+source `dirname $0`/functions
+

 BASEPATH=$1
 
 SGCONFPATH="$BASEPATH/stg/projects/sgconf"
 BASEPATH=$1
 
 SGCONFPATH="$BASEPATH/stg/projects/sgconf"


@@ -12,25 +14,11 @@ then
     exit 0
 fi
 
     exit 0
 fi
 

-printf "Got admins list:\n"
-
-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
+LOGINS=`getFields "login" "$RES"`

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

-NUM=`printf "$LOGINS" | wc -l`
+NUM=`count "$LOGINS"`

 
 printf -- "--------\n$NUM\n\n"
 
 
 printf -- "--------\n$NUM\n\n"
 

diff --git a/functest/test_services.sh b/functest/test_services.sh
index 3447c22ffb91ae3f6d1a78ee96a6d4521e828810..3bc397ae1f298c346246bd1c5ee7f071235c816c 100755 (executable)
--- a/functest/test_services.sh
+++ b/functest/test_services.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
 #!/bin/sh
 

+source `dirname $0`/functions
+

 BASEPATH=$1
 
 SGCONFPATH="$BASEPATH/stg/projects/sgconf"
 BASEPATH=$1
 
 SGCONFPATH="$BASEPATH/stg/projects/sgconf"


@@ -12,25 +14,11 @@ then
     exit 0
 fi
 
     exit 0
 fi
 

-printf "Got services list:\n"
-
-NAMES=""
-OLDIFS=$IFS
-IFS=$(printf "\n")
-for LINE in $RES
-do
-    printf -- "$LINE\n"
-    NAME=`printf "$LINE" | grep name`
-    if [ "$?" == "0" ]
-    then
-        NAMES="$NAMES\n"`printf "$NAME" | cut -d: -f2 | sed -e 's/^ *//' -e 's/ *$//'`
-    fi
-done
-IFS=$OLDIFS
+NAMES=`getFields "name" "$RES"`

 
 printf "Names:\n$NAMES\n"
 
 
 printf "Names:\n$NAMES\n"
 

-NUM=`printf "$NAMES" | wc -l`
+NUM=`count "$NAMES"`

 
 printf -- "--------\n$NUM\n\n"
 
 
 printf -- "--------\n$NUM\n\n"
 


@@ -56,25 +44,11 @@ then
     exit 0
 fi
 
     exit 0
 fi
 

-printf "Got services list:\n"
-
-NAMES=""
-OLDIFS=$IFS
-IFS=$(printf "\n")
-for LINE in $RES
-do
-    printf -- "$LINE\n"
-    NAME=`printf "$LINE" | grep name`
-    if [ "$?" == "0" ]
-    then
-        NAMES="$NAMES\n"`printf "$NAME" | cut -d: -f2 | sed -e 's/^ *//' -e 's/ *$//'`
-    fi
-done
-IFS=$OLDIFS
+NAMES=`getFields "name" "$RES"`

 
 printf "Names:\n$NAMES\n"
 
 
 printf "Names:\n$NAMES\n"
 

-NUM=`printf "$NAMES" | wc -l`
+NUM=`count "$NAMES"`

 
 printf -- "--------\n$NUM\n\n"
 
 
 printf -- "--------\n$NUM\n\n"
 


@@ -100,25 +74,11 @@ then
     exit 0
 fi
 
     exit 0
 fi
 

-printf "Got services list:\n"
-
-NAMES=""
-OLDIFS=$IFS
-IFS=$(printf "\n")
-for LINE in $RES
-do
-    printf -- "$LINE\n"
-    NAME=`printf "$LINE" | grep name`
-    if [ "$?" == "0" ]
-    then
-        NAMES="$NAMES\n"`printf "$NAME" | cut -d: -f2 | sed -e 's/^ *//' -e 's/ *$//'`
-    fi
-done
-IFS=$OLDIFS
+NAMES=`getFields "name" "$RES"`

 
 printf "Names:\n$NAMES\n"
 
 
 printf "Names:\n$NAMES\n"
 

-NUM=`printf "$NAMES" | wc -l`
+NUM=`count "$NAMES"`

 
 printf -- "--------\n$NUM\n\n"
 
 
 printf -- "--------\n$NUM\n\n"