From 7a4d9a2d2308083a9e6beae625db8a739ed237cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Prchl=C3=ADk?= Date: Tue, 12 Dec 2023 15:35:45 +0100 Subject: [PATCH] Fix dmesg check test on Fedora rawhide & newer --- tests/test/check/test-dmesg.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/test/check/test-dmesg.sh b/tests/test/check/test-dmesg.sh index c4e7666c2a..cc43c1c735 100755 --- a/tests/test/check/test-dmesg.sh +++ b/tests/test/check/test-dmesg.sh @@ -29,23 +29,29 @@ rlJournalStart if [ "$method" = "container" ]; then assert_check_result "dmesg as a before-test should fail with containers" "error" "before-test" - rlAssertGrep "dmesg: read kernel buffer failed: Permission denied" "$dump_before" + if rlIsFedora ">=40"; then + rlAssertGrep "dmesg: read kernel buffer failed: Operation not permitted" "$dump_before" + else + rlAssertGrep "dmesg: read kernel buffer failed: Permission denied" "$dump_before" + fi else assert_check_result "dmesg as a before-test should pass" "pass" "before-test" - - rlLogInfo "$(cat $dump_before)" fi + rlLogInfo "$(cat $dump_before)" rlAssertExists "$dump_after" if [ "$method" = "container" ]; then assert_check_result "dmesg as a before-test should fail with containers" "error" "after-test" - rlAssertGrep "dmesg: read kernel buffer failed: Permission denied" "$dump_after" + if rlIsFedora ">=40"; then + rlAssertGrep "dmesg: read kernel buffer failed: Operation not permitted" "$dump_after" + else + rlAssertGrep "dmesg: read kernel buffer failed: Permission denied" "$dump_after" + fi else assert_check_result "dmesg as a before-test should pass" "pass" "after-test" - - rlLogInfo "$(cat $dump_after)" fi + rlLogInfo "$(cat $dump_after)" rlPhaseEnd done