From 49b74a8b56d32db62516afc1bcd13663a7697cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 17 May 2021 22:41:22 +0200 Subject: [PATCH] ci: beakerlib tests fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switch from the deprecated execution method. Fix for the bz1798183-RFE-support-post-loaded-profile beakerlib test. Signed-off-by: Jaroslav Škarvada --- ci.fmf | 2 +- .../Program-tuned-tried-to-access-dev-mem-between/main.fmf | 1 + .../Tuned-takes-too-long-to-reload-start-when-ulimit/main.fmf | 1 + .../bz1798183-RFE-support-post-loaded-profile/main.fmf | 1 + .../bz1798183-RFE-support-post-loaded-profile/runtest.sh | 2 +- tests/beakerlib/error-messages/main.fmf | 1 + tests/beakerlib/tuned-adm-functionality/main.fmf | 1 + 7 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ci.fmf b/ci.fmf index 4f813e0..e6427de 100644 --- a/ci.fmf +++ b/ci.fmf @@ -1,4 +1,4 @@ discover: how: fmf execute: - how: beakerlib + how: tmt diff --git 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 index 7eb5865..7fdcf23 100644 --- 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 @@ -7,3 +7,4 @@ duration: 20m relevancy: | distro = rhel-4, rhel-5, rhel-6: False summary: Test for BZ#1688371 (Program tuned tried to access /dev/mem between) +framework: beakerlib diff --git 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 index c4c1236..fdae4c8 100644 --- 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 @@ -7,3 +7,4 @@ duration: 20m 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 diff --git a/tests/beakerlib/bz1798183-RFE-support-post-loaded-profile/main.fmf b/tests/beakerlib/bz1798183-RFE-support-post-loaded-profile/main.fmf index c9b95ab..eb283d2 100644 --- a/tests/beakerlib/bz1798183-RFE-support-post-loaded-profile/main.fmf +++ b/tests/beakerlib/bz1798183-RFE-support-post-loaded-profile/main.fmf @@ -10,3 +10,4 @@ require: - tuned duration: 5m extra-task: /CoreOS/tuned/Regression/bz1798183-RFE-support-post-loaded-profile +framework: beakerlib diff --git a/tests/beakerlib/bz1798183-RFE-support-post-loaded-profile/runtest.sh b/tests/beakerlib/bz1798183-RFE-support-post-loaded-profile/runtest.sh index 60d1a5b..0a52603 100755 --- a/tests/beakerlib/bz1798183-RFE-support-post-loaded-profile/runtest.sh +++ b/tests/beakerlib/bz1798183-RFE-support-post-loaded-profile/runtest.sh @@ -173,7 +173,7 @@ rlJournalStart rlRun "rlServiceStart tuned" rlAssertEquals "Check the output of tuned-adm active" \ "$(tuned-adm active)" \ - "Current active profile: post" + "Current active profile: post"$'\n'"Current post-loaded profile: post" rlAssertEquals "Check that dirty ratio is set correctly" \ "$(sysctl -n $DIRTY_RATIO)" 8 rlPhaseEnd diff --git a/tests/beakerlib/error-messages/main.fmf b/tests/beakerlib/error-messages/main.fmf index b6cc935..1d619d5 100644 --- a/tests/beakerlib/error-messages/main.fmf +++ b/tests/beakerlib/error-messages/main.fmf @@ -7,3 +7,4 @@ duration: 5m relevancy: | distro = rhel-4, rhel-5: False summary: Test for BZ#1416712 (Tuned logs error message if) +framework: beakerlib diff --git a/tests/beakerlib/tuned-adm-functionality/main.fmf b/tests/beakerlib/tuned-adm-functionality/main.fmf index fcd57d5..550b408 100644 --- a/tests/beakerlib/tuned-adm-functionality/main.fmf +++ b/tests/beakerlib/tuned-adm-functionality/main.fmf @@ -7,3 +7,4 @@ relevancy: | distro = rhel-6: False distro < rhel-7.3: False summary: Check functionality of tuned-adm tool. +framework: beakerlib