From 7823fa5aa4025bcaab23550106a8fa46abc612e1 Mon Sep 17 00:00:00 2001 From: Zdenek Pytela Date: Feb 07 2020 16:00:50 +0000 Subject: Move fedora-version test right after rlJournalStart Move fedora-version test right after rlJournalStart and use rlLog and rlJournalEnd instead of echo and exit so that the notice has expected format and the test finishes successfully even for F30. --- diff --git a/selinux-policy/rrdcached-service-and-related/runtest.sh b/selinux-policy/rrdcached-service-and-related/runtest.sh index 0104e9d..56b1a25 100755 --- a/selinux-policy/rrdcached-service-and-related/runtest.sh +++ b/selinux-policy/rrdcached-service-and-related/runtest.sh @@ -37,12 +37,13 @@ PROCESS_CONTEXT="rrdcached_t" VAR_RUN_CONTEXT="rrdcached_var_run_t" TMP_CONTEXT="rrdcached_tmp_t" -if rlIsFedora "<31" ; then - echo "Not applicable to this Fedora version." - exit -fi - rlJournalStart + if rlIsFedora "<31" ; then + rlLog "Not applicable to this Fedora version." + rlJournalEnd + exit 0 + fi + rlPhaseStartSetup rlRun "rlImport 'selinux-policy/common'" rlAssertRpm $PACKAGE