[tests/selinux] pr775-checkpolicy-revdeps: increase the duration of tests which timed out

[tests/selinux] pr775-checkpolicy-revdeps: increase the duration of tests which timed out

[Milos Malik]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : 3d1e1a1ca38943c706d99ca5e3bae5780136621c
            Author : Milos Malik <mmalik@redhat.com>
            Date   : 2025-02-24T15:34:53+01:00
            Stats  : +11/-11 in 9 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/3d1e1a1ca38943c706d99ca5e3bae5780136621c?branch=pr775-checkpolicy-revdeps

            Log:
            increase the duration of tests which timed out

There are booth commands which may stall the automated test execution.
Let's run them with a 20 second deadline.

There are other tests which need more time to finish when executed
on slower machines. Their duration got extended.

---
diff --git a/libsemanage/sanity-tests/Makefile b/libsemanage/sanity-tests/Makefile
index 23ef6ac..3d8ffa9 100644
--- a/libsemanage/sanity-tests/Makefile
+++ b/libsemanage/sanity-tests/Makefile
@@ -51,7 +51,7 @@ $(METADATA): Makefile
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     Test libsemanage functions" >> $(METADATA)
 	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        60m" >> $(METADATA)
+	@echo "TestTime:        2h" >> $(METADATA)
 	@echo "RunFor:          libsemanage" >> $(METADATA)
 	@echo "Requires:        libsemanage libsemanage-devel gcc CUnit CUnit-devel checkpolicy policycoreutils-python-utils" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)

diff --git a/libsemanage/sanity-tests/main.fmf b/libsemanage/sanity-tests/main.fmf
index 0f8b6c8..a73ec48 100644
--- a/libsemanage/sanity-tests/main.fmf
+++ b/libsemanage/sanity-tests/main.fmf
@@ -11,7 +11,7 @@ recommend:
   - CUnit-devel
   - checkpolicy
   - policycoreutils-python-utils
-duration: 60m
+duration: 2h
 enabled: true
 tag:
   - CI-Tier-1

diff --git a/libsemanage/semanage-seuser-functions/Makefile b/libsemanage/semanage-seuser-functions/Makefile
index d7202f4..4fbfa60 100644
--- a/libsemanage/semanage-seuser-functions/Makefile
+++ b/libsemanage/semanage-seuser-functions/Makefile
@@ -51,7 +51,7 @@ $(METADATA): Makefile
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     Test semanage_seuser_* functions" >> $(METADATA)
 	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        5m" >> $(METADATA)
+	@echo "TestTime:        15m" >> $(METADATA)
 	@echo "RunFor:          libsemanage" >> $(METADATA)
 	@echo "Requires:        libsemanage libsemanage-devel glibc gcc" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)

diff --git a/libsemanage/semanage-seuser-functions/main.fmf b/libsemanage/semanage-seuser-functions/main.fmf
index 5d42be0..be3d129 100644
--- a/libsemanage/semanage-seuser-functions/main.fmf
+++ b/libsemanage/semanage-seuser-functions/main.fmf
@@ -10,7 +10,7 @@ recommend:
   - libsemanage-devel
   - glibc
   - gcc
-duration: 5m
+duration: 15m
 enabled: true
 tag:
   - NoRHEL4

diff --git a/policycoreutils/linux-system-roles.selinux-tests/Makefile b/policycoreutils/linux-system-roles.selinux-tests/Makefile
index eed0222..15c1ff0 100644
--- a/policycoreutils/linux-system-roles.selinux-tests/Makefile
+++ b/policycoreutils/linux-system-roles.selinux-tests/Makefile
@@ -50,7 +50,7 @@ $(METADATA): Makefile
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     Run linux-system-roles.selinux (https://github.com/linux-system-roles/selinux.git) Ansible role tests" >> $(METADATA)
 	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        10m" >> $(METADATA)
+	@echo "TestTime:        40m" >> $(METADATA)
 	@echo "RunFor:          policycoreutils" >> $(METADATA)
 	@echo "Requires:        policycoreutils ansible git" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)

diff --git a/policycoreutils/linux-system-roles.selinux-tests/main.fmf b/policycoreutils/linux-system-roles.selinux-tests/main.fmf
index b0a8910..9588ced 100644
--- a/policycoreutils/linux-system-roles.selinux-tests/main.fmf
+++ b/policycoreutils/linux-system-roles.selinux-tests/main.fmf
@@ -9,6 +9,6 @@ recommend:
   - policycoreutils
   - ansible
   - git
-duration: 20m
+duration: 40m
 extra-summary: linux-system-roles.selinux-tests
 extra-task: linux-system-roles.selinux-tests

diff --git a/policycoreutils/org-selinux-dbus-interfaces/Makefile b/policycoreutils/org-selinux-dbus-interfaces/Makefile
index 6756710..6f00b43 100644
--- a/policycoreutils/org-selinux-dbus-interfaces/Makefile
+++ b/policycoreutils/org-selinux-dbus-interfaces/Makefile
@@ -51,7 +51,7 @@ $(METADATA): Makefile
 	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
 	@echo "Description:     Do the D-bus interfaces/methods of /org/selinux/object work as expected?" >> $(METADATA)
 	@echo "Type:            Sanity" >> $(METADATA)
-	@echo "TestTime:        10m" >> $(METADATA)
+	@echo "TestTime:        20m" >> $(METADATA)
 	@echo "RunFor:          policycoreutils" >> $(METADATA)
 	@echo "Requires:        dbus-tools policycoreutils-dbus selinux-policy-minimum selinux-policy-mls selinux-policy-targeted" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)

diff --git a/policycoreutils/org-selinux-dbus-interfaces/main.fmf b/policycoreutils/org-selinux-dbus-interfaces/main.fmf
index 40a568b..a9f924f 100644
--- a/policycoreutils/org-selinux-dbus-interfaces/main.fmf
+++ b/policycoreutils/org-selinux-dbus-interfaces/main.fmf
@@ -9,7 +9,7 @@ recommend:
   - selinux-policy-minimum
   - selinux-policy-mls
   - selinux-policy-targeted
-duration: 10m
+duration: 20m
 enabled: true
 tag:
   - NoRHEL4

diff --git a/selinux-policy/boothd-and-similar/runtest.sh b/selinux-policy/boothd-and-similar/runtest.sh
index 6c355b3..db907b6 100755
--- a/selinux-policy/boothd-and-similar/runtest.sh
+++ b/selinux-policy/boothd-and-similar/runtest.sh
@@ -86,9 +86,9 @@ rlJournalStart
         rlRun "sed -i 's/^arbitrator=.*$/arbitrator=\"${IP_ADDRESS}\"/' /etc/booth/booth.conf"
         rlRun "grep ^arbitrator /etc/booth/booth.conf"
         rlSEService - ${SERVICE_NAME} - ${PROCESS_CONTEXT} "start status" 1
-        rlRun "booth list"
-        rlRun "booth status"
-        rlRun "booth peers"
+        rlWatchdog "booth list" 20
+        rlWatchdog "booth status" 20
+        rlWatchdog "booth peers" 20
         rlRun "restorecon -Rv /etc /var /run -e /var/ARTIFACTS" 0-255
         rlSEService - ${SERVICE_NAME} - ${PROCESS_CONTEXT} "restart status stop status" 1
     rlPhaseEnd