From 84870c22625876a5ecc369eef21b18597d967571 Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Thu, 12 Oct 2017 11:56:15 +0200
Subject: Adapt service checks for gfx and nogfx case
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Based on SPEC-949, remove the afm-user-daemon service as it is a session service and no system service.
Add systemctl list-units at the end.

Bug-AGL: SPEC-949

Change-Id: I90cde515efc5dbbd031691026f76345f8828be1a
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 common/scripts/service-check-gfx.sh   | 25 +++++++++++++++++++------
 common/scripts/service-check-nogfx.sh | 29 ++++++++++++++++++++++-------
 2 files changed, 41 insertions(+), 13 deletions(-)
 mode change 100755 => 100644 common/scripts/service-check-nogfx.sh

diff --git a/common/scripts/service-check-gfx.sh b/common/scripts/service-check-gfx.sh
index 2a5353b..f9bfa87 100755
--- a/common/scripts/service-check-gfx.sh
+++ b/common/scripts/service-check-gfx.sh
@@ -1,25 +1,38 @@
 #!/bin/bash
 
+export LANG=C
+export TERM=dumb
+
 REQUIREDSOCKETS="cynara.socket dbus.socket security-manager.socket"
-REQUIREDSERVICES="afm-system-daemon.service afm-user-daemon.service connman.service ofono.service weston.service HomeScreen.service lightmediascanner.service bluetooth.service"
+REQUIREDSERVICES="afm-system-daemon.service connman.service ofono.service weston.service HomeScreen.service lightmediascanner.service bluetooth.service"
 
 ALL="${REQUIREDSOCKETS} ${REQUIREDSERVICES}"
 RESULT="unknown"
 
 for i in ${ALL} ; do
-    echo -e "\n########## Test for service ${i} being active ##########\n"
+    echo -e "\n\n########## Test for service ${i} being active ##########\n\n"
+
     systemctl is-active ${i} >/dev/null 2>&1
     if [ $? -eq 0 ] ; then
         RESULT="pass"
     else
         RESULT="fail"
     fi
+
     lava-test-case ${i} --result ${RESULT}
+    systemctl status ${i} || true
+    echo -e "\n\n"
 
-    if [ x"fail" == x"${RESULT}" ] ; then
-        systemctl status ${i} || true
-    fi
-    echo -e "\n########## Result for service ${i} : $RESULT ##########\n"
+    echo -e "\n\n########## Result for service ${i} : $RESULT ##########\n\n"
 done
 
+echo "------------------------------------------------"
+echo "All systemd units:"
+echo "------------------------------------------------"
+systemctl list-units || true
+echo "------------------------------------------------"
+echo "Only the failed systemd units:"
+echo "------------------------------------------------"
+( systemctl list-units | grep failed ) || true
+
 exit 0
\ No newline at end of file
diff --git a/common/scripts/service-check-nogfx.sh b/common/scripts/service-check-nogfx.sh
old mode 100755
new mode 100644
index 62d1b3d..5b74ff1
--- a/common/scripts/service-check-nogfx.sh
+++ b/common/scripts/service-check-nogfx.sh
@@ -1,25 +1,40 @@
 #!/bin/bash
 
-REQUIREDSOCKETS="cynara.socket security-manager.socket"
-REQUIREDSERVICES="afm-system-daemon.service afm-user-daemon.service connman.service"
+export LANG=C
+export TERM=dumb
+
+REQUIREDSOCKETS="cynara.socket dbus.socket security-manager.socket"
+REQUIREDSERVICES="afm-system-daemon.service connman.service ofono.service bluetooth.service"
 
 ALL="${REQUIREDSOCKETS} ${REQUIREDSERVICES}"
 RESULT="unknown"
 
 for i in ${ALL} ; do
-    echo -e "\n########## Test for service ${i} being active ##########\n"
+    echo -e "\n\n########## Test for service ${i} being active ##########\n\n"
+
     systemctl is-active ${i} >/dev/null 2>&1
     if [ $? -eq 0 ] ; then
         RESULT="pass"
     else
         RESULT="fail"
     fi
+
     lava-test-case ${i} --result ${RESULT}
+    systemctl status ${i} || true
+    echo -e "\n\n"
 
-    if [ x"fail" == x"${RESULT}" ] ; then
-        systemctl status ${i} || true
-    fi
-    echo -e "\n########## Result for service ${i} : $RESULT ##########\n"
+    echo -e "\n\n########## Result for service ${i} : $RESULT ##########\n\n"
 done
 
+
+echo "------------------------------------------------"
+echo "All systemd units:"
+echo "------------------------------------------------"
+systemctl list-units || true
+echo "------------------------------------------------"
+echo "Only the failed systemd units:"
+echo "------------------------------------------------"
+( systemctl list-units | grep failed ) || true
+
+
 exit 0
\ No newline at end of file
-- 
cgit 1.2.3-korg