From 63b7812201fd3b20c7c0efdea23e24d09c11f8a1 Mon Sep 17 00:00:00 2001
From: Corentin LABBE <clabbe@baylibre.com>
Date: Mon, 15 Jun 2020 14:29:06 +0200
Subject: [PATCH] SPEC-3427: check if RID is null

RID could be null if process failed to start.
In that case, we will retry to start it.
On a second fail, we will not continue the test suite and fail.

In th same time add a second status check, but after a delay to be sure
the service is still working.

Bug-AGL: SPEC-3427
Change-Id: I566f1aefa06cbb791674373340ce87be220b18a2
Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
---
 common/scripts/application-lifecycle.sh | 34 ++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/common/scripts/application-lifecycle.sh b/common/scripts/application-lifecycle.sh
index b5ee32b..4484917 100755
--- a/common/scripts/application-lifecycle.sh
+++ b/common/scripts/application-lifecycle.sh
@@ -222,6 +222,23 @@ do
 	fi
 	# TODO, compare RID with the list in $PSLIST"
 	RID="$(cat rid)"
+	if [ "$RID" == 'null' ];then
+		sleep 20
+		echo "DEBUG: retry start $NAMEID"
+		do_afm_util start $NAMEID > "rid"
+		if [ $? -ne 0 ];then
+			echo "ERROR: afm-util start"
+			lava-test-case afm-util-start-$WGTNAME --result fail
+			continue
+		fi
+		RID="$(cat rid)"
+	fi
+
+	if [ "$RID" == 'null' ];then
+		echo "ERROR: RID is null, service fail to start"
+		lava-test-case afm-util-status-$WGTNAME --result fail
+		continue
+	fi
 
 	echo "DEBUG: status $NAMEID ($RID)"
 	do_afm_util status $RID
@@ -244,7 +261,7 @@ do
 	fi
 
 	echo "DEBUG: start2 $NAMEID"
-	do_afm_util start $NAMEID
+	do_afm_util start $NAMEID > rid
 	if [ $? -ne 0 ];then
 		echo "ERROR: afm-util start2"
 		lava-test-case afm-util-start2-$WGTNAME --result fail
@@ -252,4 +269,19 @@ do
 	else
 		lava-test-case afm-util-start2-$WGTNAME --result pass
 	fi
+	RID="$(cat rid)"
+	if [ "$RID" == 'null' ];then
+		echo "ERROR: RID is null"
+		continue
+	fi
+	sleep 120
+	echo "DEBUG: status2 $NAMEID ($RID)"
+	do_afm_util status $RID
+	if [ $? -ne 0 ];then
+		echo "ERROR: afm-util status2"
+		lava-test-case afm-util-status2-$WGTNAME --result fail
+		continue
+	else
+		lava-test-case afm-util-status2-$WGTNAME --result pass
+	fi
 done
-- 
2.16.6