Update tests: disable systemd rate limiting.

2022-03-16 05:59:30 -04:00 · 2022-03-16 05:59:30 -04:00 · 178bc00dc8
commit 178bc00dc8
parent 7b1a20b64c
11 changed files with 46 additions and 18 deletions
--- a/tests/beakerlib/Program-tuned-tried-to-access-dev-mem-between/main.fmf
+++ b/tests/beakerlib/Program-tuned-tried-to-access-dev-mem-between/main.fmf
@ -8,3 +8,5 @@ relevancy: |
    distro = rhel-4, rhel-5, rhel-6: False
 summary: Test for BZ#1688371 (Program tuned tried to access /dev/mem between)
 framework: beakerlib
+require:
+  - library(tuned/basic)
--- a/tests/beakerlib/Program-tuned-tried-to-access-dev-mem-between/runtest.sh
+++ b/tests/beakerlib/Program-tuned-tried-to-access-dev-mem-between/runtest.sh
@ -24,6 +24,9 @@ rlJournalStart
        rlAssertRpm $PACKAGE
        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
        rlRun "pushd $TmpDir"
+        rlImport "tuned/basic"
+
+        tunedDisableSystemdRateLimitingStart
        rlServiceStop "tuned"
        # systemd can have some issues with quick restarts sometimes
        sleep 1
@ -36,6 +39,7 @@ rlJournalStart
    rlPhaseEnd

    rlPhaseStartCleanup
+        tunedDisableSystemdRateLimitingEnd
        rlRun "popd"
        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
        rlServiceRestore "tuned"
--- a/tests/beakerlib/Tuned-takes-too-long-to-reload-start-when-ulimit/main.fmf
+++ b/tests/beakerlib/Tuned-takes-too-long-to-reload-start-when-ulimit/main.fmf
@ -8,3 +8,8 @@ relevancy: |
    distro = rhel-4, rhel-5, rhel-6: False
 summary: Test for BZ#1663412 (TuneD takes too long to reload/start when \"ulimit)
 framework: beakerlib
+require:
+  - library(tuned/basic)
+recommend:
+  - psmisc
+  - tuned
--- a/tests/beakerlib/Tuned-takes-too-long-to-reload-start-when-ulimit/runtest.sh
+++ b/tests/beakerlib/Tuned-takes-too-long-to-reload-start-when-ulimit/runtest.sh
@ -22,6 +22,8 @@ PACKAGE="tuned"
 rlJournalStart
    rlPhaseStartSetup
        rlAssertRpm $PACKAGE
+        rlImport "tuned/basic"
+        tunedDisableSystemdRateLimitingStart
        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
        rlRun "pushd $TmpDir"
        rlServiceStop "tuned"
@ -41,6 +43,11 @@ rlJournalStart
        rlRun "popd"
        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"

+        killall tuned
+        rlRun "sleep 3"
+        killall tuned
+
+        tunedDisableSystemdRateLimitingEnd
        rlFileRestore
        rlServiceRestore "tuned"
    rlPhaseEnd
--- a/tests/beakerlib/bz1798183-RFE-support-post-loaded-profile/main.fmf
+++ b/tests/beakerlib/bz1798183-RFE-support-post-loaded-profile/main.fmf
@ -7,7 +7,8 @@ contact:
 component:
 - tuned
 require:
- tuned
+  - tuned
+  - library(tuned/basic)
 duration: 5m
 extra-task: /CoreOS/tuned/Regression/bz1798183-RFE-support-post-loaded-profile
 framework: beakerlib
--- a/tests/beakerlib/bz1798183-RFE-support-post-loaded-profile/runtest.sh
+++ b/tests/beakerlib/bz1798183-RFE-support-post-loaded-profile/runtest.sh
@ -61,6 +61,8 @@ function wait_for_tuned_stop()
 rlJournalStart
    rlPhaseStartSetup
        rlAssertRpm $PACKAGE
+        rlImport "tuned/basic"
+        tunedDisableSystemdRateLimitingStart
        rlRun "for PYTHON in $PYTHON_CHECK; do \$PYTHON --version 2>/dev/null && break; done" 0 "Detect python"
        rlRun "rlFileBackup --clean $PROFILE_DIR"
        rlRun "cp -r parent $PROFILE_DIR"
@ -259,6 +261,7 @@ rlJournalStart
    rlPhaseEnd

    rlPhaseStartCleanup
+        tunedDisableSystemdRateLimitingEnd
        rlRun "popd"
        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
        rlRun "rlFileRestore"
--- a/tests/beakerlib/error-messages/main.fmf
+++ b/tests/beakerlib/error-messages/main.fmf
@ -8,3 +8,5 @@ relevancy: |
    distro = rhel-4, rhel-5: False
 summary: Test for BZ#1416712 (TuneD logs error message if)
 framework: beakerlib
+require:
+  - library(tuned/basic)
--- a/tests/beakerlib/error-messages/runtest.sh
+++ b/tests/beakerlib/error-messages/runtest.sh
@ -23,30 +23,32 @@ rlJournalStart
    rlPhaseStartSetup
        rlAssertRpm $PACKAGE
        rlImport "tuned/basic"
+        tunedDisableSystemdRateLimitingStart
        rlServiceStart "tuned"
        tunedProfileBackup
    rlPhaseEnd

    rlPhaseStartTest "Test of profile balanced"
-	rlRun "cat /usr/lib/tuned/balanced/tuned.conf | grep alpm="
-    	echo > /var/log/tuned/tuned.log
-	rlRun "tuned-adm profile balanced"
-	rlRun "tuned-adm active | grep balanced"
-	rlRun "cat /var/log/tuned/tuned.log | grep -v 'ERROR    tuned.utils.commands: Reading /sys/class/scsi_host/host0/link_power_management_policy'"
-	rlRun "cat /var/log/tuned/tuned.log | grep -v 'WARNING  tuned.plugins.plugin_scsi_host: ALPM control file'"
+        rlRun "cat /usr/lib/tuned/balanced/tuned.conf | grep alpm="
+        echo > /var/log/tuned/tuned.log
+        rlRun "tuned-adm profile balanced"
+        rlRun "tuned-adm active | grep balanced"
+        rlRun "cat /var/log/tuned/tuned.log | grep -v 'ERROR    tuned.utils.commands: Reading /sys/class/scsi_host/host0/link_power_management_policy'"
+        rlRun "cat /var/log/tuned/tuned.log | grep -v 'WARNING  tuned.plugins.plugin_scsi_host: ALPM control file'"
    rlPhaseEnd

    rlPhaseStartTest "Test of profile powersave"
-    	rlRun "cat /usr/lib/tuned/powersave/tuned.conf | grep alpm="
-	echo > /var/log/tuned/tuned.log
-	rlRun "tuned-adm profile powersave"
-	rlRun "tuned-adm active | grep powersave"
-	rlRun "cat /var/log/tuned/tuned.log | grep -v 'ERROR    tuned.utils.commands: Reading /sys/class/scsi_host/host0/link_power_management_policy'"
-	rlRun "cat /var/log/tuned/tuned.log | grep -v 'WARNING  tuned.plugins.plugin_scsi_host: ALPM control file'"
+        rlRun "cat /usr/lib/tuned/powersave/tuned.conf | grep alpm="
+        echo > /var/log/tuned/tuned.log
+        rlRun "tuned-adm profile powersave"
+        rlRun "tuned-adm active | grep powersave"
+        rlRun "cat /var/log/tuned/tuned.log | grep -v 'ERROR    tuned.utils.commands: Reading /sys/class/scsi_host/host0/link_power_management_policy'"
+        rlRun "cat /var/log/tuned/tuned.log | grep -v 'WARNING  tuned.plugins.plugin_scsi_host: ALPM control file'"
    rlPhaseEnd

    rlPhaseStartCleanup
-    	tunedProfileRestore
+        tunedDisableSystemdRateLimitingEnd
+        tunedProfileRestore
    rlPhaseEnd
 rlJournalPrintText
 rlJournalEnd
--- a/tests/beakerlib/tuned-adm-functionality/main.fmf
+++ b/tests/beakerlib/tuned-adm-functionality/main.fmf
@ -8,3 +8,5 @@ relevancy: |
    distro < rhel-7.3: False
 summary: Check functionality of tuned-adm tool.
 framework: beakerlib
+require:
+  - library(tuned/basic)
--- a/tests/beakerlib/tuned-adm-functionality/runtest.sh
+++ b/tests/beakerlib/tuned-adm-functionality/runtest.sh
@ -25,6 +25,7 @@ rlJournalStart
        rlAssertRpm $PACKAGE
        rlImport "tuned/basic"
        tunedProfileBackup
+        tunedDisableSystemdRateLimitingStart
    rlPhaseEnd

    rlPhaseStartTest "Test tuned-adm LIST"
@ -82,6 +83,7 @@ rlJournalStart
    rlPhaseEnd

    rlPhaseStartCleanup
+        tunedDisableSystemdRateLimitingEnd
        tunedProfileRestore
        rlServiceRestore "tuned"
    rlPhaseEnd
--- a/tests/beakerlib/variables-support-in-profiles/runtest.sh
+++ b/tests/beakerlib/variables-support-in-profiles/runtest.sh
@ -22,11 +22,8 @@ PACKAGE="tuned"
 rlJournalStart
    rlPhaseStartSetup
        rlAssertRpm $PACKAGE
-        rlFileBackup --clean /etc/systemd/system.conf.d
-        rlRun "mkdir -p /etc/systemd/system.conf.d"
-        rlRun "echo -e '[Manager]\nDefaultStartLimitInterval=0' > /etc/systemd/system.conf.d/tuned.conf" 0 "Disable systemd rate limiting"
-        rlRun "systemctl daemon-reload"
        rlImport "tuned/basic"
+        rlRun "tunedDisableSystemdRateLimitingStart"
        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
        rlRun "pushd $TmpDir"
        rlServiceStart "tuned"
@ -56,6 +53,7 @@ vm.swappiness = \${SWAPPINESS2}

    rlPhaseStartCleanup
        rlRun "sysctl vm.swappiness=$OLD_SWAPPINESS"
+        tunedDisableSystemdRateLimitingEnd
        rlFileRestore
        tunedProfileRestore
        rlServiceRestore "tuned"