From e3670463b1575db7ebade5e5b4dbb2372ca4b17b Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: May 20 2014 06:08:22 +0000 Subject: Fixed the procinfo test for el7 -> disabled as no package available on el7 --- diff --git a/tests/p_procinfo/0-install_procinfo.sh b/tests/p_procinfo/0-install_procinfo.sh index 2651497..868c8a6 100755 --- a/tests/p_procinfo/0-install_procinfo.sh +++ b/tests/p_procinfo/0-install_procinfo.sh @@ -5,9 +5,8 @@ t_Log "Running $0 - attempting to install procinfo" -if (t_GetPkgRel basesystem | grep -q el6) -then - t_Log "It seems to be a CentOS 6.x system, this test will be disabled" +if [ "$centos_ver" -gt "5" ] ; then + t_Log "It seems to be a CentOS $centos_ver system, this test will be disabled -> SKIP" exit 0 else # ProcInfo Utility Package diff --git a/tests/p_procinfo/5-test_procinfo.sh b/tests/p_procinfo/5-test_procinfo.sh index ed545f0..67fba24 100755 --- a/tests/p_procinfo/5-test_procinfo.sh +++ b/tests/p_procinfo/5-test_procinfo.sh @@ -5,9 +5,8 @@ t_Log "Running $0 - checking procinfo runs and returns non-zero exit status." -if (t_GetPkgRel basesystem | grep -q el6) -then - t_Log "It seems to be a CentOS 6.x system, this test will be disabled" +if [ "$centos_ver" -gt "5" ] ; then + t_Log "It seems to be a CentOS $centos_ver system, this test will be disabled -> SKIP" exit 0 else if [ $SKIP_QA_HARNESS -eq 1 ]; then