Also call kill in the right context

[src/qa-testdefinitions.git] / common / scripts / application-lifecycle.sh

diff --git a/common/scripts/application-lifecycle.sh b/common/scripts/application-lifecycle.sh
old mode 100644 (file)
new mode 100755 (executable)
index 9e3a92c..0bc7f08
--- a/common/scripts/application-lifecycle.sh
+++ b/common/scripts/application-lifecycle.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 
+set -x
+
 export TERM=dumb
+export COLUMNS=1000
+
+AGLDRIVER=agl-driver
 
 while [ $# -ge 1 ]
 do
@@ -23,6 +28,16 @@ if [ -z "$BASEURL" ]; then
        exit 1
 fi
 
+do_afm_util()
+{
+       if [ $SERVICE_USER -eq 1 -o $APPLICATION_USER -eq 1 ];then
+               su - $AGLDRIVER -c "afm-util $*"
+       else
+               afm-util $*
+       fi
+       return $?
+}
+
 wget -q $BASEURL -O index.html
 if [ $? -ne 0 ];then
        echo "ERROR: Cannot wget $BASEURL"
@@ -33,6 +48,9 @@ grep -o '[a-z-]*.wgt' index.html | sort | uniq |
 while read wgtfile
 do
        WGTNAME=$(echo $wgtfile | sed 's,.wgt$,,')
+       SERVICE_PLATFORM=0
+       SERVICE_USER=0
+       APPLICATION_USER=0
        echo "DEBUG: fetch $wgtfile"
        wget -q $BASEURL/$wgtfile
        if [ $? -ne 0 ];then
@@ -42,13 +60,32 @@ do
 
        echo "DEBUG: analyse wgt file"
        unzip $wgtfile
-       if [ $? -eq 0 ];then
+       if [ $? -ne 0 ];then
+               # TODO Do not fail yet, busybox unzip seems to "fail with success" when checking CRC
+               echo "ERROR: cannot unzip $wgtfile"
+       fi
+       if [ -f config.xml ];then
                grep hidden config.xml
                if [ $? -eq 0 ];then
                        echo "DEBUG: hidden package"
                else
                        echo "DEBUG: not hidden package"
                fi
+               # a service sets urn:AGL:widget:provided-api
+               grep "urn:AGL:widget:provided-api" config.xml
+               if [ $? -eq 0 ] ; then
+                   # we are a service, now determine the scope ...
+                   grep "urn:AGL:permission::partner:scope-platform" config.xml
+                   if [ $? -eq 0 ];then
+                       SERVICE_PLATFORM=1
+                   else
+                       SERVICE_USER=1
+                   fi
+               else
+                   # we are an application
+                   APPLICATION_USER=1
+                   # no other type known (yet)
+               fi
        else
                echo "DEBUG: fail to unzip"
        fi
@@ -71,7 +108,7 @@ do
        if [ ! -z "$NAMEID" ];then
                echo "DEBUG: $WGTNAME already installed as $NAMEID"
                # need to kill then deinstall
-               afm-util ps | grep -q $WGTNAME
+               afm-util ps --all | grep -q $WGTNAME
                if [ $? -eq 0 ];then
                        echo "DEBUG: kill $WGTNAME"
                        afm-util kill $WGTNAME
@@ -137,7 +174,7 @@ do
                echo "DEBUG: end of list"
        fi
 
-       afm-util info $NAMEID
+       do_afm_util info $NAMEID
        if [ $? -ne 0 ];then
                echo "ERROR: afm-util info"
                lava-test-case afm-util-info-$WGTNAME --result fail
@@ -151,7 +188,7 @@ do
        systemctl -a |grep "afm.*$WGTNAME"
 
        echo "DEBUG: start $NAMEID"
-       afm-util start $NAMEID > "rid"
+       do_afm_util start $NAMEID > "rid"
        if [ $? -ne 0 ];then
                echo "ERROR: afm-util start"
                lava-test-case afm-util-start-$WGTNAME --result fail
@@ -167,7 +204,7 @@ do
 
        echo "DEBUG: Get RID for $NAMEID"
        PSLIST="pslist"
-       afm-util ps > $PSLIST
+       afm-util ps --all > $PSLIST
        if [ $? -ne 0 ];then
                echo "ERROR: afm-util ps"
                lava-test-case afm-util-ps-$WGTNAME --result fail
@@ -180,7 +217,7 @@ do
        RID="$(cat rid)"
 
        echo "DEBUG: status $NAMEID ($RID)"
-       afm-util status $RID
+       do_afm_util status $RID
        if [ $? -ne 0 ];then
                echo "ERROR: afm-util status"
                lava-test-case afm-util-status-$WGTNAME --result fail
@@ -190,7 +227,7 @@ do
        fi
 
        echo "DEBUG: kill $NAMEID ($RID)"
-       afm-util kill $NAMEID
+       do_afm_util kill $NAMEID
        if [ $? -ne 0 ];then
                echo "ERROR: afm-util kill"
                lava-test-case afm-util-kill-$WGTNAME --result fail
@@ -200,7 +237,7 @@ do
        fi
 
        echo "DEBUG: start2 $NAMEID"
-       afm-util start $NAMEID
+       do_afm_util start $NAMEID
        if [ $? -ne 0 ];then
                echo "ERROR: afm-util start2"
                lava-test-case afm-util-start2-$WGTNAME --result fail