public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Milos Malik <mmalik@redhat.com>
To: git-commits@fedoraproject.org
Subject: [tests/selinux] pr775-checkpolicy-revdeps: do not test services which are not present
Date: Fri, 11 Sep 2026 13:22:06 GMT [thread overview]
Message-ID: <178913292628.1.3046682382452905405.tests-selinux-f179552e1bf5@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : tests/selinux
Branch : pr775-checkpolicy-revdeps
Commit : f179552e1bf5c31c2a8ed9d43cbb1c56fc669bba
Author : Milos Malik <mmalik@redhat.com>
Date : 2024-10-08T08:14:51+00:00
Stats : +66/-21 in 11 file(s)
URL : https://src.fedoraproject.org/tests/selinux/c/f179552e1bf5c31c2a8ed9d43cbb1c56fc669bba?branch=pr775-checkpolicy-revdeps
Log:
do not test services which are not present
Try to install packages which bring the services if they are
not present already.
Skip the "real scenario" test phase if the service is missing.
---
diff --git a/selinux-policy/bgpd-and-similar/runtest.sh b/selinux-policy/bgpd-and-similar/runtest.sh
index 8d9e844..7cb5b26 100755
--- a/selinux-policy/bgpd-and-similar/runtest.sh
+++ b/selinux-policy/bgpd-and-similar/runtest.sh
@@ -49,9 +49,10 @@ rlJournalStart
rlAssertRpm ${PACKAGE}
rlAssertRpm ${PACKAGE}-targeted
if ! rpm -q ${SERVICE_PACKAGE} ; then
- rlRun "yum -y install ${SERVICE_PACKAGE} --enablerepo epel"
+ rlRun "yum -y install ${SERVICE_PACKAGE} --enablerepo epel" 0,1
+ else
+ rlAssertRpm ${SERVICE_PACKAGE}
fi
- rlAssertRpm ${SERVICE_PACKAGE}
rlServiceStop ${SERVICE_NAME}
rlFileBackup /etc/bgpd.conf
@@ -77,6 +78,7 @@ rlJournalStart
rlSESearchRule "type_transition ${SOURCE_TYPE} ${FILE_CONTEXT} : process ${PROCESS_CONTEXT} $BOOLEANS"
rlPhaseEnd
+ if [ -f /usr/lib/systemd/system/${SERVICE_NAME}.service ] ; then
rlPhaseStartTest "real scenario -- standalone service"
rlRun "sed -i 's/^\(include.*\)$/# \1/' /etc/bgpd.conf"
if rlIsRHEL 8 || rlIsCentOS 8 ; then
@@ -85,13 +87,14 @@ rlJournalStart
PROCESS_CONTEXT="unconfined_service_t"
fi
rlSEService - ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "start status" 1
- rlRun "restorecon -Rv /run /var -e /var/ARTIFACTS" 0-255
+ rlRun "restorecon -Rv /etc /run /var -e /var/ARTIFACTS" 0-255
rlSEService - ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "restart status stop status" 1
if rlIsRHEL 8 || rlIsCentOS 8 ; then
# work around BZ#1830170 that was closed as WONTFIX
rlRun "restorecon -v /usr/sbin/bgpd"
fi
rlPhaseEnd
+ fi
rlPhaseStartCleanup
sleep 2
diff --git a/selinux-policy/blueman-and-similar/runtest.sh b/selinux-policy/blueman-and-similar/runtest.sh
index a0b6ec8..ee32cbb 100755
--- a/selinux-policy/blueman-and-similar/runtest.sh
+++ b/selinux-policy/blueman-and-similar/runtest.sh
@@ -51,9 +51,10 @@ rlJournalStart
rlAssertRpm ${PACKAGE}
rlAssertRpm ${PACKAGE}-targeted
if ! rpm -q ${SERVICE_PACKAGE} ; then
- rlRun "yum -y install ${SERVICE_PACKAGE} --enablerepo epel"
+ rlRun "yum -y install ${SERVICE_PACKAGE} --enablerepo epel" 0,1
+ else
+ rlAssertRpm ${SERVICE_PACKAGE}
fi
- rlAssertRpm ${SERVICE_PACKAGE}
rlServiceStop ${SERVICE_NAME}
rlFileBackup /etc/shadow
@@ -98,6 +99,7 @@ rlJournalStart
rlSESearchRule "allow blueman_t gconf_home_t : dir { read } [ ]"
rlPhaseEnd
+ if [ -f /usr/lib/systemd/system/${SERVICE_NAME}.service ] ; then
rlPhaseStartTest "real scenario -- standalone service"
rlRun "echo ${ROOT_PASSWORD} | passwd --stdin root"
if ! rlSEDefined ${PROCESS_CONTEXT} ; then
@@ -107,9 +109,10 @@ rlJournalStart
rlSEService ${ROOT_PASSWORD} ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "start status" 1
PYTHON_VERSION=`python --version | tr -d ' ' | cut -d . -f 1,2 | tr '[:upper:]' '[:lower:]'`
rlRun "mkdir -p ~/.local/lib/${PYTHON_VERSION}/site-packages/"
- rlRun "restorecon -Rv /var /run -e /var/ARTIFACTS" 0-255
+ rlRun "restorecon -Rv /etc /var /run -e /var/ARTIFACTS" 0-255
rlSEService ${ROOT_PASSWORD} ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "restart status stop status" 1
rlPhaseEnd
+ fi
rlPhaseStartCleanup
sleep 2
diff --git a/selinux-policy/boinc-and-similar/runtest.sh b/selinux-policy/boinc-and-similar/runtest.sh
index ab2647c..3db917c 100755
--- a/selinux-policy/boinc-and-similar/runtest.sh
+++ b/selinux-policy/boinc-and-similar/runtest.sh
@@ -44,7 +44,11 @@ rlJournalStart
rlSESatisfyRequires
rlAssertRpm ${PACKAGE}
rlAssertRpm ${PACKAGE}-targeted
- rlAssertRpm ${SERVICE_PACKAGE}
+ if ! rpm -q ${SERVICE_PACKAGE} ; then
+ rlRun "yum -y install ${SERVICE_PACKAGE} --enablerepo epel" 0,1
+ else
+ rlAssertRpm ${SERVICE_PACKAGE}
+ fi
rlServiceStop ${SERVICE_NAME}
rlFileBackup /etc/shadow
@@ -81,6 +85,7 @@ rlJournalStart
# ReadWritePaths=/var/lib/boinc
rlPhaseEnd
+ if [ -f /usr/lib/systemd/system/${SERVICE_NAME}.service ] ; then
rlPhaseStartTest "real scenario -- standalone service"
rlRun "echo ${ROOT_PASSWORD} | passwd --stdin root"
if ! rlSEDefined ${PROCESS_CONTEXT} ; then
@@ -91,9 +96,10 @@ rlJournalStart
fi
fi
rlSEService ${ROOT_PASSWORD} ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "start status" 1
- rlRun "restorecon -Rv /run /var -e /var/ARTIFACTS" 0-255
+ rlRun "restorecon -Rv /etc /run /var -e /var/ARTIFACTS" 0-255
rlSEService ${ROOT_PASSWORD} ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "restart status stop status" 1
rlPhaseEnd
+ fi
rlPhaseStartCleanup
sleep 2
diff --git a/selinux-policy/caddy-and-similar/runtest.sh b/selinux-policy/caddy-and-similar/runtest.sh
index 39f8301..ca34360 100755
--- a/selinux-policy/caddy-and-similar/runtest.sh
+++ b/selinux-policy/caddy-and-similar/runtest.sh
@@ -41,9 +41,10 @@ rlJournalStart
rlAssertRpm ${PACKAGE}
rlAssertRpm ${PACKAGE}-targeted
if ! rpm -q ${SERVICE_PACKAGE} ; then
- rlRun "yum -y install ${SERVICE_PACKAGE} --enablerepo epel"
+ rlRun "yum -y install ${SERVICE_PACKAGE} --enablerepo epel" 0,1
+ else
+ rlAssertRpm ${SERVICE_PACKAGE}
fi
- rlAssertRpm ${SERVICE_PACKAGE}
rlServiceStop caddy caddy-api
@@ -72,7 +73,7 @@ rlJournalStart
rlRun "semanage fcontext -l -C | grep caddy"
for SERVICE_NAME in caddy caddy-api ; do
rlSEService - ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "start status" 1
- rlRun "restorecon -Rv /run /var -e /var/ARTIFACTS" 0-255
+ rlRun "restorecon -Rv /etc /run /var -e /var/ARTIFACTS" 0-255
rlSEService - ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "restart status stop status" 1
done
rlPhaseEnd
diff --git a/selinux-policy/cups-pdf-and-similar/runtest.sh b/selinux-policy/cups-pdf-and-similar/runtest.sh
index 0e2613e..c5b67c0 100755
--- a/selinux-policy/cups-pdf-and-similar/runtest.sh
+++ b/selinux-policy/cups-pdf-and-similar/runtest.sh
@@ -51,10 +51,11 @@ rlJournalStart
rlSESatisfyRequires
rlAssertRpm ${PACKAGE}
rlAssertRpm ${PACKAGE}-targeted
- if ! rpm -q cups-pdf >& /dev/null ; then
- rlRun "yum -y install cups-pdf --enablerepo epel"
+ if ! rpm -q ${SERVICE_PACKAGE} >& /dev/null ; then
+ rlRun "yum -y install ${SERVICE_PACKAGE} --enablerepo epel" 0,1
+ else
+ rlAssertRpm ${SERVICE_PACKAGE}
fi
- rlAssertRpm ${SERVICE_PACKAGE}
rlServiceStart ${SERVICE_NAME}
rlFileBackup /etc/shadow
diff --git a/selinux-policy/exim-and-similar/runtest.sh b/selinux-policy/exim-and-similar/runtest.sh
index 7a422c0..4ed843c 100755
--- a/selinux-policy/exim-and-similar/runtest.sh
+++ b/selinux-policy/exim-and-similar/runtest.sh
@@ -44,7 +44,11 @@ rlJournalStart
rlSESatisfyRequires
rlAssertRpm ${PACKAGE}
rlAssertRpm ${PACKAGE}-targeted
- rlAssertRpm ${SERVICE_PACKAGE}
+ if ! rpm -q ${SERVICE_PACKAGE} ; then
+ rlRun "yum -y install ${SERVICE_PACKAGE} --enablerepo epel" 0,1
+ else
+ rlAssertRpm ${SERVICE_PACKAGE}
+ fi
rlServiceStop ${SERVICE_NAME}
rlFileBackup /etc/shadow
@@ -92,6 +96,7 @@ rlJournalStart
rlPhaseEnd
fi
+ if [ -f /usr/lib/systemd/system/${SERVICE_NAME}.service ] ; then
rlPhaseStartTest "real scenario -- standalone service"
rlRun "echo ${ROOT_PASSWORD} | passwd --stdin root"
if ! rlSEDefined ${PROCESS_CONTEXT} ; then
@@ -100,7 +105,7 @@ rlJournalStart
fi
rlSEService ${ROOT_PASSWORD} ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "start status" 1
rlRun "lsof | grep exim_daemon_notify"
- rlRun "restorecon -Rv /run /var -e /var/ARTIFACTS" 0-255
+ rlRun "restorecon -Rv /etc /run /var -e /var/ARTIFACTS" 0-255
rlSEService ${ROOT_PASSWORD} ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "restart status stop status" 1
rlPhaseEnd
@@ -116,6 +121,7 @@ rlJournalStart
rlRun "service atd stop"
rlRun "service exim stop"
rlPhaseEnd
+ fi
rlPhaseStartCleanup
sleep 2
diff --git a/selinux-policy/ntpsec-and-similar/runtest.sh b/selinux-policy/ntpsec-and-similar/runtest.sh
index 355bf1f..2531b93 100755
--- a/selinux-policy/ntpsec-and-similar/runtest.sh
+++ b/selinux-policy/ntpsec-and-similar/runtest.sh
@@ -43,7 +43,11 @@ rlJournalStart
rlSESatisfyRequires
rlAssertRpm ${PACKAGE}
rlAssertRpm ${PACKAGE}-targeted
- rlAssertRpm ${SERVICE_PACKAGE}
+ if ! rpm -q ${SERVICE_PACKAGE} ; then
+ rlRun "yum -y install ${SERVICE_PACKAGE} --enablerepo epel" 0,1
+ else
+ rlAssertRpm ${SERVICE_PACKAGE}
+ fi
rlServiceStop ${SERVICE_NAME}
rlFileBackup /etc/ntp.conf
@@ -60,6 +64,7 @@ rlJournalStart
rlSEMatchPortCon tcp 4460 ntske_port_t
rlPhaseEnd
+ if [ -f /usr/lib/systemd/system/${SERVICE_NAME}.service ] ; then
rlPhaseStartTest "real scenario -- standalone service"
if ! rlSEDefined ${PROCESS_CONTEXT} ; then
# for environments where the SELinux domain does not exist yet
@@ -70,6 +75,7 @@ rlJournalStart
rlRun "restorecon -Rv /etc /var /run -e /var/ARTIFACTS" 0-255
rlSEService - ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "restart status stop status" 1
rlPhaseEnd
+ fi
rlPhaseStartCleanup
sleep 2
diff --git a/selinux-policy/opensmtpd-and-similar/runtest.sh b/selinux-policy/opensmtpd-and-similar/runtest.sh
index 3fe0ce5..be11811 100755
--- a/selinux-policy/opensmtpd-and-similar/runtest.sh
+++ b/selinux-policy/opensmtpd-and-similar/runtest.sh
@@ -43,7 +43,11 @@ rlJournalStart
rlSESatisfyRequires
rlAssertRpm ${PACKAGE}
rlAssertRpm ${PACKAGE}-targeted
- rlAssertRpm ${SERVICE_PACKAGE}
+ if ! rpm -q ${SERVICE_PACKAGE} ; then
+ rlRun "yum -y install ${SERVICE_PACKAGE} --enablerepo epel" 0,1
+ else
+ rlAssertRpm ${SERVICE_PACKAGE}
+ fi
rlServiceStop ${SERVICE_NAME} postfix sendmail
@@ -74,6 +78,7 @@ rlJournalStart
rlPhaseEnd
fi
+ if [ -f /usr/lib/systemd/system/${SERVICE_NAME}.service ] ; then
rlPhaseStartTest "real scenario -- standalone service"
if ! ls -Z ${FILE_PATH} | grep -q ${FILE_CONTEXT} ; then
# for environments where the service is not yet confined
@@ -85,6 +90,7 @@ rlJournalStart
rlRun "smtpctl show status"
rlSEService - ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "restart status stop status" 1
rlPhaseEnd
+ fi
rlPhaseStartCleanup
sleep 2
diff --git a/selinux-policy/snapd-and-similar/runtest.sh b/selinux-policy/snapd-and-similar/runtest.sh
index e9e39e0..8fbc405 100755
--- a/selinux-policy/snapd-and-similar/runtest.sh
+++ b/selinux-policy/snapd-and-similar/runtest.sh
@@ -43,7 +43,11 @@ rlJournalStart
rlSESatisfyRequires
rlAssertRpm ${PACKAGE}
rlAssertRpm ${PACKAGE}-targeted
- rlAssertRpm ${SERVICE_PACKAGE}
+ if ! rpm -q ${SERVICE_PACKAGE} ; then
+ rlRun "yum -y install ${SERVICE_PACKAGE} --enablerepo epel" 0,1
+ else
+ rlAssertRpm ${SERVICE_PACKAGE}
+ fi
rlAssertRpm spamassassin
# rlServiceStop ${SERVICE_NAME}
@@ -63,6 +67,7 @@ rlJournalStart
rlSESearchRule "allow spamd_t snappy_var_lib_t : dir { search } [ ]"
rlPhaseEnd
+ if [ -f /usr/lib/systemd/system/${SERVICE_NAME}.service ] ; then
rlPhaseStartTest "real scenario -- standalone service"
rlRun "ls -alRZ /var/lib/snapd"
rlRun "semodule -lfull | grep snap"
@@ -78,6 +83,7 @@ rlJournalStart
rlRun "service spamassassin stop"
rlRun "service spamassassin status" 3
rlPhaseEnd
+ fi
rlPhaseStartCleanup
sleep 2
diff --git a/selinux-policy/systemd-timesyncd-and-similar/runtest.sh b/selinux-policy/systemd-timesyncd-and-similar/runtest.sh
index 2367349..bded838 100755
--- a/selinux-policy/systemd-timesyncd-and-similar/runtest.sh
+++ b/selinux-policy/systemd-timesyncd-and-similar/runtest.sh
@@ -128,7 +128,7 @@ rlJournalStart
PROCESS_CONTEXT="unconfined_service_t"
fi
rlSEService ${ROOT_PASSWORD} ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "start status" 1
- rlRun "restorecon -Rv /run /var -e /var/ARTIFACTS" 0-255
+ rlRun "restorecon -Rv /etc /run /var -e /var/ARTIFACTS" 0-255
rlSEService ${ROOT_PASSWORD} ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "restart status stop status" 1
rlPhaseEnd
fi
diff --git a/selinux-policy/tlp-and-similar/runtest.sh b/selinux-policy/tlp-and-similar/runtest.sh
index 2ec22bb..0c67f65 100755
--- a/selinux-policy/tlp-and-similar/runtest.sh
+++ b/selinux-policy/tlp-and-similar/runtest.sh
@@ -44,7 +44,11 @@ rlJournalStart
rlSESatisfyRequires
rlAssertRpm ${PACKAGE}
rlAssertRpm ${PACKAGE}-targeted
- rlAssertRpm ${SERVICE_PACKAGE}
+ if ! rpm -q ${SERVICE_PACKAGE} ; then
+ rlRun "yum -y install ${SERVICE_PACKAGE} --enablerepo epel" 0,1
+ else
+ rlAssertRpm ${SERVICE_PACKAGE}
+ fi
rlServiceStop ${SERVICE_NAME}
rlFileBackup /etc/shadow
@@ -87,6 +91,7 @@ rlJournalStart
rlPhaseEnd
fi
+ if [ -f /usr/lib/systemd/system/${SERVICE_NAME}.service ] ; then
rlPhaseStartTest "real scenario -- standalone service"
if rpm -q snapd >& /dev/null ; then
rlRun "ls -alRZ /var/lib/snapd"
@@ -101,8 +106,10 @@ rlJournalStart
fi
rlSEService ${ROOT_PASSWORD} ${SERVICE_NAME} - ${PROCESS_CONTEXT} "start status" 1
rlRun "tlp-stat -v"
+ rlRun "restorecon -Rv /etc /run /var -e /var/ARTIFACTS" 0-255
rlSEService ${ROOT_PASSWORD} ${SERVICE_NAME} - ${PROCESS_CONTEXT} "restart status stop status" 1
rlPhaseEnd
+ fi
rlPhaseStartCleanup
sleep 2
reply other threads:[~2026-09-11 13:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178913292628.1.3046682382452905405.tests-selinux-f179552e1bf5@fedoraproject.org \
--to=mmalik@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox