X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fscripts%2Fapplication-lifecycle.sh;h=569749d3c4f62784598156fa22f77d56ecf936b0;hb=refs%2Fchanges%2F68%2F26068%2F1;hp=73bd9ebdda1909d18b8546a992c6eb370beeb783;hpb=28de853aa86eea3a96b9c1b73848cb8b0de8241c;p=src%2Fqa-testdefinitions.git

diff --git a/common/scripts/application-lifecycle.sh b/common/scripts/application-lifecycle.sh
index 73bd9eb..569749d 100755
--- a/common/scripts/application-lifecycle.sh
+++ b/common/scripts/application-lifecycle.sh
@@ -8,7 +8,8 @@ export COLUMNS=1000
 AGLDRIVER=agl-driver
 
 # for pyagl - unless redefined in a test
-AGL_AVAILABLE_INTERFACES="ethernet"
+export AGL_AVAILABLE_INTERFACES="ethernet"
+export AGL_CAN_INTERFACE="vcan0"
 
 while [ $# -ge 1 ]
 do
@@ -176,11 +177,11 @@ do_release_test() {
 	afm-util list --all > $LIST
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util list exit with error"
-		continue
+		return 1
 	fi
 	if [ ! -s "$LIST" ];then
 		echo "ERROR: afm-util list is empty"
-		continue
+		return 1
 	fi
 
 	echo "DEBUG: check presence of $WGTNAME"
@@ -224,7 +225,7 @@ do_release_test() {
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util install"
 		lava-test-case afm-util-install-$WGTNAMEF --result fail
-		continue
+		return 1
 	else
 		lava-test-case afm-util-install-$WGTNAMEF --result pass
 	fi
@@ -235,18 +236,18 @@ do_release_test() {
 		echo "DEBUG: ========== DUMPING output =========="
 		cat $OUT
 		echo "DEBUG: ========== END DUMP =========="
-		continue
+		return 1
 	fi
 	echo "DEBUG: $WGTNAME is installed as $NAMEID"
 
 	afm-util list --all > $LIST
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util list exit with error"
-		continue
+		return 1
 	fi
 	if [ ! -s "$LIST" ];then
 		echo "ERROR: afm-util list is empty"
-		continue
+		return 1
 	fi
 	echo "DEBUG: Verify that $WGTNAME is installed"
 	grep -q $NAMEID $LIST
@@ -277,7 +278,7 @@ do_release_test() {
 		echo "ERROR: afm-util start"
 		lava-test-case afm-util-start-$WGTNAMEF --result fail
 		journalctl -an 200
-		continue
+		return 1
 	else
 		lava-test-case afm-util-start-$WGTNAMEF --result pass
 	fi
@@ -290,7 +291,7 @@ do_release_test() {
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util ps"
 		lava-test-case afm-util-ps-$WGTNAMEF --result fail
-		continue
+		return 1
 	else
 		cat $PSLIST
 		lava-test-case afm-util-ps-$WGTNAMEF --result pass
@@ -304,7 +305,7 @@ do_release_test() {
 		if [ $? -ne 0 ];then
 			echo "ERROR: afm-util start"
 			lava-test-case afm-util-start-$WGTNAMEF --result fail
-			continue
+			return 1
 		fi
 		RID="$(cat rid)"
 	fi
@@ -312,7 +313,7 @@ do_release_test() {
 	if [ "$RID" == 'null' ];then
 		echo "ERROR: RID is null, service fail to start"
 		lava-test-case afm-util-status-$WGTNAMEF --result fail
-		continue
+		return 1
 	fi
 
 	echo "DEBUG: status $NAMEID ($RID)"
@@ -320,7 +321,7 @@ do_release_test() {
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util status"
 		lava-test-case afm-util-status-$WGTNAMEF --result fail
-		continue
+		return 1
 	else
 		lava-test-case afm-util-status-$WGTNAMEF --result pass
 	fi
@@ -330,7 +331,7 @@ do_release_test() {
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util kill"
 		lava-test-case afm-util-kill-$WGTNAMEF --result fail
-		continue
+		return 1
 	else
 		lava-test-case afm-util-kill-$WGTNAMEF --result pass
 	fi
@@ -341,14 +342,14 @@ do_release_test() {
 		echo "ERROR: afm-util start2"
 		lava-test-case afm-util-start2-$WGTNAMEF --result fail
 		journalctl -an 200
-		continue
+		return 1
 	else
 		lava-test-case afm-util-start2-$WGTNAMEF --result pass
 	fi
 	RID="$(cat rid)"
 	if [ "$RID" == 'null' ];then
 		echo "ERROR: RID is null"
-		continue
+		return 1
 	fi
 	sleep 10
 	echo "DEBUG: status2 $NAMEID ($RID)"
@@ -356,7 +357,7 @@ do_release_test() {
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util status2"
 		lava-test-case afm-util-status2-$WGTNAMEF --result fail
-		continue
+		return 1
 	else
 		lava-test-case afm-util-status2-$WGTNAMEF --result pass
 	fi
@@ -368,25 +369,7 @@ do
 	if [ -e $WGTNAME.wgt ];then
 		inspect_wgt $WGTNAME.wgt $WGTNAME
 		do_release_test $WGTNAME $WGTNAME.wgt
-	else
-		echo "WARN: cannot find $WGTNAME.wgt"
-	fi
-	if [ -e $WGTNAME-test.wgt ];then
-		# wgt-test do not have the same permissions in the config.xml as the parent wgt
-		# so keep the value from last run
-		#inspect_wgt $WGTNAME-test.wgt
-		check_service_running $WGTNAME
-		if [ $? -eq 1 ];then
-			do_afm_test $TOPDIR/$WGTNAME-test.wgt
-			if [ $? -eq 0 ];then
-				lava-test-case run-test-$WGTNAME --result pass
-			else
-				lava-test-case run-test-$WGTNAME --result fail
-			fi
-		else
-			echo "DEBUG: $WGTNAME is not running, skipping test"
-			lava-test-case run-test-$WGTNAME --result skip
-		fi
+		pytest --show-capture=no --color=no -k "not hwrequired and not internet" /usr/lib/python?.?/site-packages/pyagl/tests/ -L
 	else
 		echo "WARN: cannot find $WGTNAME.wgt"
 	fi
@@ -394,22 +377,5 @@ do
 		inspect_wgt $WGTNAME-debug.wgt $WGTNAME
 		do_release_test $WGTNAME $WGTNAME-debug.wgt
 	fi
-	if [ -e $WGTNAME-coverage.wgt ];then
-		inspect_wgt $WGTNAME-coverage.wgt $WGTNAME
-		do_release_test $WGTNAME $WGTNAME-coverage.wgt
-		check_service_running $WGTNAME
-		if [ $? -eq 1 ];then
-			afm-util install $TOPDIR/$WGTNAME-test.wgt
-			do_afm_test $TOPDIR/$WGTNAME-test.wgt
-			if [ $? -eq 0 ];then
-				lava-test-case run-test-$WGTNAME --result pass
-			else
-				lava-test-case run-test-$WGTNAME --result fail
-			fi
-		else
-			echo "DEBUG: $WGTNAME is not running, skipping test"
-			lava-test-case run-test-$WGTNAME --result skip
-		fi
-	fi
 done