From 9d2331212081ed60b580bb44a46d311dd587e4aa Mon Sep 17 00:00:00 2001 From: Athmane Madjoudj Date: Nov 17 2011 16:17:54 +0000 Subject: Fix minicom test / Workaround SELinux issue on some envs --- diff --git a/tests/p_audit/auditd_running.sh b/tests/p_audit/auditd_running.sh index 649091f..182a0c8 100755 --- a/tests/p_audit/auditd_running.sh +++ b/tests/p_audit/auditd_running.sh @@ -3,6 +3,9 @@ t_Log "Running $0 - check if auditd is running." -service auditd status > /dev/null 2>&1 - -t_CheckExitStatus $? +if [ $SKIP_QA_HARNESS ]; then + echo "Skipping this test ..." +else + service auditd status > /dev/null 2>&1 + t_CheckExitStatus $? +fi diff --git a/tests/p_minicom/minicom_test.sh b/tests/p_minicom/minicom_test.sh index 4c63bae..71183c3 100755 --- a/tests/p_minicom/minicom_test.sh +++ b/tests/p_minicom/minicom_test.sh @@ -14,6 +14,6 @@ else VERSION="2.1" fi -minicom -v | grep "${CHECK_FOR}" >/dev/null 2>&1 +minicom -v | grep "${VERSION}" >/dev/null 2>&1 t_CheckExitStatus $? diff --git a/tests/p_selinux/selinux_enforce.sh b/tests/p_selinux/selinux_enforce.sh index a38e044..fe5e2af 100755 --- a/tests/p_selinux/selinux_enforce.sh +++ b/tests/p_selinux/selinux_enforce.sh @@ -3,7 +3,9 @@ t_Log "Running $0 - check if SELinux is in enforcing mode" -cat /selinux/enforce | grep 1 > /dev/null 2>&1 - -t_CheckExitStatus $? - +if [ $SKIP_QA_HARNESS ]; then + echo "Skipping this test ..." +else + cat /selinux/enforce | grep 1 > /dev/null 2>&1 + t_CheckExitStatus $? +fi