[tests/selinux] pr775-checkpolicy-revdeps: improve the failing tests

[tests/selinux] pr775-checkpolicy-revdeps: improve the failing tests

[Milos Malik]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : ab5c434f532b59a3068e3e62e1e142e953a262d8
            Author : Milos Malik <mmalik@redhat.com>
            Date   : 2024-05-18T11:21:13+02:00
            Stats  : +8/-5 in 6 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/ab5c434f532b59a3068e3e62e1e142e953a262d8?branch=pr775-checkpolicy-revdeps

            Log:
            improve the failing tests

The /policycoreutils/setfiles_binary test: the --downloaddir option
is not recognized by the latest version of DNF. The option is removed
now.

The /other/update-packages test: the --skip-broken option is not
recognized by the latest version of DNF. The option is removed now.

The /selinux-policy/install-uninstall-dsp-packages test: let's not
run this test together with other tests, because it often finds
a problem that brakes the environment for the following tests.

---
diff --git a/other/update-packages/runtest.sh b/other/update-packages/runtest.sh
index 967588e..bcdf7d6 100755
--- a/other/update-packages/runtest.sh
+++ b/other/update-packages/runtest.sh
@@ -9,7 +9,7 @@ rlJournalStart
 
     rlPhaseStartTest
         rlRun "dnf clean all"
-        rlRun "dnf -y update --skip-broken --allowerasing"
+        rlRun "dnf -y update --nobest --allowerasing"
     rlPhaseEnd
 
     rlPhaseStartCleanup

diff --git a/policycoreutils/setfiles_binary/Makefile b/policycoreutils/setfiles_binary/Makefile
index 121f784..c3251f3 100644
--- a/policycoreutils/setfiles_binary/Makefile
+++ b/policycoreutils/setfiles_binary/Makefile
@@ -42,7 +42,6 @@ build: $(BUILT_FILES)
 clean:
 	rm -f *~ $(BUILT_FILES)
 
-
 include /usr/share/rhts/lib/rhts-make.include
 
 $(METADATA): Makefile
@@ -59,5 +58,7 @@ $(METADATA): Makefile
 	@echo "License:         GPLv2" >> $(METADATA)
 	@echo "Confidential:    no" >> $(METADATA)
 	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHEL5 -RHEL6 -RHEL7" >> $(METADATA)
 	@echo "Bug:             1973754" >> $(METADATA) # RHEL-8
+
 	rhts-lint $(METADATA)

diff --git a/policycoreutils/setfiles_binary/PURPOSE b/policycoreutils/setfiles_binary/PURPOSE
index 7389189..57f484f 100644
--- a/policycoreutils/setfiles_binary/PURPOSE
+++ b/policycoreutils/setfiles_binary/PURPOSE
@@ -1,3 +1,3 @@
 PURPOSE of /CoreOS/policycoreutils/Sanity/setfiles_binary
-Description: Setfiles should allow checking given path against binary policy
+Description: setfiles should allow checking given path against binary policy
 Author: Vit Mojzis <vmojzis@redhat.com>

diff --git a/policycoreutils/setfiles_binary/main.fmf b/policycoreutils/setfiles_binary/main.fmf
index 9c1c4f8..0f46801 100644
--- a/policycoreutils/setfiles_binary/main.fmf
+++ b/policycoreutils/setfiles_binary/main.fmf
@@ -15,7 +15,7 @@ tag:
   - NoRHEL7
   - targeted
 link:
-  - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1973754
+  - verifies: https://bugzilla.redhat.com/show_bug.cgi?id=1973754
 adjust:
   - enabled: false
     when: distro == rhel-4, rhel-5, rhel-6, rhel-7

diff --git a/policycoreutils/setfiles_binary/runtest.sh b/policycoreutils/setfiles_binary/runtest.sh
index e7a292f..7221573 100755
--- a/policycoreutils/setfiles_binary/runtest.sh
+++ b/policycoreutils/setfiles_binary/runtest.sh
@@ -40,7 +40,7 @@ rlJournalStart
         rlRun "mkdir policy"
         rlRun "pushd policy"
         # download and extract selinux-policy-targeted
-        rlRun "dnf download selinux-policy-targeted --downloaddir ."
+        rlRun "dnf download selinux-policy-targeted"
         rlRun "rpm2cpio *.rpm | cpio -idm"
         rlRun "popd"
         # create a mockup of root directory structure
@@ -67,6 +67,7 @@ done
             rlRun "cat setfilesout2"
         fi
     rlPhaseEnd
+
     rlPhaseStartCleanup
         rlRun "popd"
         rlRun "rm -r $TmpDir" 0 "Removing tmp directory"

diff --git a/selinux-policy/install-uninstall-dsp-packages/main.fmf b/selinux-policy/install-uninstall-dsp-packages/main.fmf
index 00025b2..e7306d0 100644
--- a/selinux-policy/install-uninstall-dsp-packages/main.fmf
+++ b/selinux-policy/install-uninstall-dsp-packages/main.fmf
@@ -25,6 +25,7 @@ tag:
   - NoRHEL6
   - NoRHEL7
   - TIPfail_Security
+  - failinfedora
   - targeted
 link:
 adjust: