[tests/selinux] pr775-checkpolicy-revdeps: improve the tests which end with a timeout

[tests/selinux] pr775-checkpolicy-revdeps: improve the tests which end with a timeout

[Milos Malik]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : 215a9d1ffbff3323d5bab0e1505ca9c68d1426c3
            Author : Milos Malik <mmalik@redhat.com>
            Date   : 2023-05-31T10:10:08+02:00
            Stats  : +4/-11 in 6 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/215a9d1ffbff3323d5bab0e1505ca9c68d1426c3?branch=pr775-checkpolicy-revdeps

            Log:
            improve the tests which end with a timeout

Certain tests end up with a timeout because they run the ncat
program in the background and they do not stop it. The framework
which runs the tests apparently cannot cope with this fact.

---
diff --git a/selinux-policy/bz733494-amanda-and-similar/main.fmf b/selinux-policy/bz733494-amanda-and-similar/main.fmf
index 2a38b85..0563a0c 100644
--- a/selinux-policy/bz733494-amanda-and-similar/main.fmf
+++ b/selinux-policy/bz733494-amanda-and-similar/main.fmf
@@ -24,7 +24,6 @@ recommend:
   - krb5-workstation
   - selinux-policy
   - selinux-policy-targeted
-  - setools
   - setools-console
   - xinetd
 environment:
@@ -33,11 +32,6 @@ duration: 15m
 enabled: true
 tag:
   - NoRHEL4
-  - TIP_fedora_fail
-  - TIPfail_Apps
-  - TIPfail_Security
-  - TIPfail_fedora
-  - TIPpass
   - TierCandidatesFAIL
   - f32friendly
   - failinfedora

diff --git a/selinux-policy/bz733494-amanda-and-similar/runtest.sh b/selinux-policy/bz733494-amanda-and-similar/runtest.sh
index 6c42aa5..1e0451a 100755
--- a/selinux-policy/bz733494-amanda-and-similar/runtest.sh
+++ b/selinux-policy/bz733494-amanda-and-similar/runtest.sh
@@ -218,6 +218,7 @@ rlJournalStart
         rlRun "ps -o pid,user,context,args -C ${PROCESS_NAME}"
         rlRun "ps -o pid,user,context,args -C ${PROCESS_NAME} | grep :${PROCESS_CONTEXT}"
         rlRun "kill ${PROVOCATEUR_PID}"
+        rlRun "killall ncat" 0,1
         rlRun "systemctl stop kamanda.socket"
         rlRun "systemctl disable kamanda.socket"
     rlPhaseEnd
@@ -246,6 +247,7 @@ rlJournalStart
         rlRun "ps -o pid,user,context,args -C ${PROCESS_NAME}"
         rlRun "ps -o pid,user,context,args -C ${PROCESS_NAME} | grep :${PROCESS_CONTEXT}"
         rlRun "kill ${PROVOCATEUR_PID}"
+        rlRun "killall ncat" 0,1
         if rlIsRHEL 5 6 ; then
             rlRun "chkconfig ${SERVICE_NAME} off"
             rlRun "service xinetd stop"

diff --git a/selinux-policy/cockpit-ws-and-similar/main.fmf b/selinux-policy/cockpit-ws-and-similar/main.fmf
index 1180f0a..db8d927 100644
--- a/selinux-policy/cockpit-ws-and-similar/main.fmf
+++ b/selinux-policy/cockpit-ws-and-similar/main.fmf
@@ -31,7 +31,6 @@ tag:
   - NoRHEL4
   - NoRHEL5
   - NoRHEL6
-  - TIPfail_Security
   - TierCandidatesPASS
   - failinfedora
   - targeted

diff --git a/selinux-policy/cockpit-ws-and-similar/runtest.sh b/selinux-policy/cockpit-ws-and-similar/runtest.sh
index a2807c9..3a17767 100755
--- a/selinux-policy/cockpit-ws-and-similar/runtest.sh
+++ b/selinux-policy/cockpit-ws-and-similar/runtest.sh
@@ -210,6 +210,7 @@ rlJournalStart
         rlRun "ps -o pid,user,context,args -C ${PROCESS_NAME}"
         rlRun "ps -o pid,user,context,args -C ${PROCESS_NAME} | grep :${PROCESS_CONTEXT}"
         rlRun "kill ${PROVOCATEUR_PID}"
+        rlRun "killall ncat" 0,1
         if rlIsRHEL 5 6 ; then
             rlRun "chkconfig ${SERVICE_NAME} off"
             rlRun "service xinetd stop"

diff --git a/selinux-policy/cups-lpd-and-similar/main.fmf b/selinux-policy/cups-lpd-and-similar/main.fmf
index b2ad36f..ef5985d 100644
--- a/selinux-policy/cups-lpd-and-similar/main.fmf
+++ b/selinux-policy/cups-lpd-and-similar/main.fmf
@@ -18,7 +18,6 @@ recommend:
   - policycoreutils
   - selinux-policy
   - selinux-policy-targeted
-  - setools
   - setools-console
   - xinetd
   - nmap-ncat
@@ -34,9 +33,6 @@ enabled: true
 tag:
   - NoRHEL4
   - RHEL8
-  - TIPfail
-  - TIPfail_infra
-  - TIPpass_Security
   - Tier2
   - Tier2se
   - TierCandidatesFAIL

diff --git a/selinux-policy/cups-lpd-and-similar/runtest.sh b/selinux-policy/cups-lpd-and-similar/runtest.sh
index 6b3952d..2191da5 100755
--- a/selinux-policy/cups-lpd-and-similar/runtest.sh
+++ b/selinux-policy/cups-lpd-and-similar/runtest.sh
@@ -138,6 +138,7 @@ rlJournalStart
         rlRun "ps -o pid,user,context,args -C ${PROCESS_NAME}"
         rlRun "ps -o pid,user,context,args -C ${PROCESS_NAME} | grep :${PROCESS_CONTEXT}"
         rlRun "kill ${PROVOCATEUR_PID}"
+        rlRun "killall ncat" 0,1
         if rlIsRHEL 5 6 ; then
             rlRun "chkconfig ${SERVICE_NAME} off"
             rlRun "service xinetd stop"