[tests/selinux] pr775-checkpolicy-revdeps: Explicitly exclude packages which make the test fail

[tests/selinux] pr775-checkpolicy-revdeps: Explicitly exclude packages which make the test fail

[Zdenek Pytela]

A new commit has been pushed.

Repo   : tests/selinux
Branch : pr775-checkpolicy-revdeps
Commit : 479b08630fbcb9f87554f6a257a5a11afa32d2d3
Author : Zdenek Pytela <zpytela@redhat.com>
Date   : 2024-04-29T06:49:08+00:00
Stats  : +6/-3 in 2 file(s)
URL    : https://src.fedoraproject.org/tests/selinux/c/479b08630fbcb9f87554f6a257a5a11afa32d2d3?branch=pr775-checkpolicy-revdeps

Log:
Explicitly exclude packages which make the test fail

---
diff --git a/selinux-policy/install-uninstall-dsp-packages/main.fmf b/selinux-policy/install-uninstall-dsp-packages/main.fmf
index 6da6f00..f5c81aa 100644
--- a/selinux-policy/install-uninstall-dsp-packages/main.fmf
+++ b/selinux-policy/install-uninstall-dsp-packages/main.fmf
@@ -14,9 +14,10 @@ recommend:
   - selinux-policy
   - selinux-policy-targeted
   - dnf
+  - perl
 environment:
     AVC_ERROR: +no_avc_check
-duration: 40m
+duration: 60m
 enabled: true
 tag:
   - NoRHEL4

diff --git a/selinux-policy/install-uninstall-dsp-packages/runtest.sh b/selinux-policy/install-uninstall-dsp-packages/runtest.sh
index 571a4d0..45d59b4 100755
--- a/selinux-policy/install-uninstall-dsp-packages/runtest.sh
+++ b/selinux-policy/install-uninstall-dsp-packages/runtest.sh
@@ -110,6 +110,9 @@ rlJournalStart
         rlRun "sed -i '/beaker-tasks/d' install-list"
 	# exclude debuginfo packages
         rlRun "sed -i '/-debuginfo/d' install-list"
+	# exclude packages which make the test fail
+        rlRun "sed -i '/mrtg-selinux/d' install-list"
+        rlRun "sed -i '/vfrnav-selinux/d' install-list"
 	# packages names only
         rlRun "awk '{print \$1}' install-list > pkgonlylist"
 	# exclude updates-source
@@ -154,7 +157,7 @@ rlJournalStart
 	if grep -q "/run = /var/run" ${FCONTEXT_LIST}; then
 	    rlLogInfo "Legacy equivalency settings \"/run = /var/run\" are in place."
 	elif grep -q "/var/run = /run" ${FCONTEXT_LIST}; then
-	    rlLog "New equivalency settings /\"var/run = /run\" are in place."
+	    rlLog "New equivalency settings \"/var/run = /run\" are in place."
 	    grep -v "/var/run = /run" ${FCONTEXT_LIST} > ${FCONTEXT_LIST2}
 	    if grep -q "^/var/run" ${FCONTEXT_LIST2}; then
 		rlLogWarning "/var/run entries found in the file context database"
@@ -184,7 +187,6 @@ rlJournalStart
 	    rlRun "seinfo -xa unconfined_domain_type > ${UNCONFINED_DOMAINS}"
 	    rlRun "semodule -lfull > ${SEMODULE_LIST}"
 	    rlRun "grep -v ^100 ${SEMODULE_LIST} > ${SEMODULE_LIST_DSP}"
-	    rlRpmInstall "perl"
 	    rlRun "./dbus-sendmsg.pl > ${DBUS_SENDMSG}"
 	fi
     rlPhaseEnd