Code Review
/
src
/
qa-testdefinitions.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
application-lifecycle: replace continue by return
[src/qa-testdefinitions.git]
/
common
/
scripts
/
application-lifecycle.sh
diff --git
a/common/scripts/application-lifecycle.sh
b/common/scripts/application-lifecycle.sh
index
9044a41
..
72be11f
100755
(executable)
--- a/
common/scripts/application-lifecycle.sh
+++ b/
common/scripts/application-lifecycle.sh
@@
-5,7
+5,11
@@
set -x
export TERM=dumb
export COLUMNS=1000
export TERM=dumb
export COLUMNS=1000
-AGLDRIVER=agl-driver
+export AGLDRIVER=agl-driver
+
+# for pyagl - unless redefined in a test
+export AGL_AVAILABLE_INTERFACES="ethernet"
+export AGL_CAN_INTERFACE="vcan0"
while [ $# -ge 1 ]
do
while [ $# -ge 1 ]
do
@@
-173,11
+177,11
@@
do_release_test() {
afm-util list --all > $LIST
if [ $? -ne 0 ];then
echo "ERROR: afm-util list exit with error"
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"
fi
if [ ! -s "$LIST" ];then
echo "ERROR: afm-util list is empty"
- continue
+ return 1
fi
echo "DEBUG: check presence of $WGTNAME"
fi
echo "DEBUG: check presence of $WGTNAME"
@@
-221,7
+225,7
@@
do_release_test() {
if [ $? -ne 0 ];then
echo "ERROR: afm-util install"
lava-test-case afm-util-install-$WGTNAMEF --result fail
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
else
lava-test-case afm-util-install-$WGTNAMEF --result pass
fi
@@
-232,18
+236,18
@@
do_release_test() {
echo "DEBUG: ========== DUMPING output =========="
cat $OUT
echo "DEBUG: ========== END DUMP =========="
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"
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"
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
fi
echo "DEBUG: Verify that $WGTNAME is installed"
grep -q $NAMEID $LIST
@@
-274,7
+278,7
@@
do_release_test() {
echo "ERROR: afm-util start"
lava-test-case afm-util-start-$WGTNAMEF --result fail
journalctl -an 200
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
else
lava-test-case afm-util-start-$WGTNAMEF --result pass
fi
@@
-287,7
+291,7
@@
do_release_test() {
if [ $? -ne 0 ];then
echo "ERROR: afm-util ps"
lava-test-case afm-util-ps-$WGTNAMEF --result fail
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
else
cat $PSLIST
lava-test-case afm-util-ps-$WGTNAMEF --result pass
@@
-301,7
+305,7
@@
do_release_test() {
if [ $? -ne 0 ];then
echo "ERROR: afm-util start"
lava-test-case afm-util-start-$WGTNAMEF --result fail
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
fi
RID="$(cat rid)"
fi
@@
-309,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
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)"
fi
echo "DEBUG: status $NAMEID ($RID)"
@@
-317,7
+321,7
@@
do_release_test() {
if [ $? -ne 0 ];then
echo "ERROR: afm-util status"
lava-test-case afm-util-status-$WGTNAMEF --result fail
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
else
lava-test-case afm-util-status-$WGTNAMEF --result pass
fi
@@
-327,7
+331,7
@@
do_release_test() {
if [ $? -ne 0 ];then
echo "ERROR: afm-util kill"
lava-test-case afm-util-kill-$WGTNAMEF --result fail
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
else
lava-test-case afm-util-kill-$WGTNAMEF --result pass
fi
@@
-338,14
+342,14
@@
do_release_test() {
echo "ERROR: afm-util start2"
lava-test-case afm-util-start2-$WGTNAMEF --result fail
journalctl -an 200
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"
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)"
fi
sleep 10
echo "DEBUG: status2 $NAMEID ($RID)"
@@
-353,7
+357,7
@@
do_release_test() {
if [ $? -ne 0 ];then
echo "ERROR: afm-util status2"
lava-test-case afm-util-status2-$WGTNAMEF --result fail
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
else
lava-test-case afm-util-status2-$WGTNAMEF --result pass
fi
@@
-365,7
+369,7
@@
do
if [ -e $WGTNAME.wgt ];then
inspect_wgt $WGTNAME.wgt $WGTNAME
do_release_test $WGTNAME $WGTNAME.wgt
if [ -e $WGTNAME.wgt ];then
inspect_wgt $WGTNAME.wgt $WGTNAME
do_release_test $WGTNAME $WGTNAME.wgt
- pytest --show-capture=no --color=no -k "not hwrequired" /usr/lib/python?.?/site-packages/pyagl/tests/ -L
+ 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
else
echo "WARN: cannot find $WGTNAME.wgt"
fi