Fix dmesg check test on Fedora rawhide & newer

teemtee · Dec 12, 2023 · 7a4d9a2 · 7a4d9a2
1 parent 1a46dbb
commit 7a4d9a2
Showing 1 changed file with 12 additions and 6 deletions.
diff --git 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