[tests/selinux] pr775-checkpolicy-revdeps: load_policy: accommodate changes in policy load audit message

[tests/selinux] pr775-checkpolicy-revdeps: load_policy: accommodate changes in policy load audit message

[Vit Mojzis]

A new commit has been pushed.

Repo   : tests/selinux
Branch : pr775-checkpolicy-revdeps
Commit : beb6ea9a50ff7b684b0894aef3b8f5bcd4b1f921
Author : Vit Mojzis <vmojzis@redhat.com>
Date   : 2019-03-13T15:28:33+01:00
Stats  : +12/-2 in 1 file(s)
URL    : https://src.fedoraproject.org/tests/selinux/c/beb6ea9a50ff7b684b0894aef3b8f5bcd4b1f921?branch=pr775-checkpolicy-revdeps

Log:
load_policy: accommodate changes in policy load audit message

---
diff --git a/policycoreutils/load_policy/runtest.sh b/policycoreutils/load_policy/runtest.sh
index 2a77654..c9f98a1 100755
--- a/policycoreutils/load_policy/runtest.sh
+++ b/policycoreutils/load_policy/runtest.sh
@@ -57,7 +57,12 @@ rlJournalStart
         if rlIsRHEL ; then
             rlRun "ausearch -m MAC_POLICY_LOAD -i -ts ${START_DATE_TIME} | grep load_policy"
         fi
-        rlRun "ausearch -m MAC_POLICY_LOAD -i -ts ${START_DATE_TIME} | grep 'policy loaded'"
+        if rhIsRHEL 5 6 7 ; then
+            rlRun "ausearch -m MAC_POLICY_LOAD -i -ts ${START_DATE_TIME} | grep 'policy loaded'"
+        else
+            # we assume that audit message has a different format now (does not contain "policy loaded")
+            rlRun "ausearch -m MAC_POLICY_LOAD -i -ts ${START_DATE_TIME} | grep 'type=MAC_POLICY_LOAD'"
+        fi
         rlRun "umount ${SELINUX_FS_MOUNT}"
         rlRun "grep -i selinux /proc/mounts" 1
         START_DATE_TIME=`date "+%m/%d/%Y %T"`
@@ -68,7 +73,12 @@ rlJournalStart
         if rlIsRHEL ; then
             rlRun "ausearch -m MAC_POLICY_LOAD -i -ts ${START_DATE_TIME} | grep load_policy"
         fi
-        rlRun "ausearch -m MAC_POLICY_LOAD -i -ts ${START_DATE_TIME} | grep 'policy loaded'"
+        if rhIsRHEL 5 6 7 ; then
+            rlRun "ausearch -m MAC_POLICY_LOAD -i -ts ${START_DATE_TIME} | grep 'policy loaded'"
+        else
+            # we assume that audit message has a different format now (does not contain "policy loaded")
+            rlRun "ausearch -m MAC_POLICY_LOAD -i -ts ${START_DATE_TIME} | grep 'type=MAC_POLICY_LOAD'"
+        fi
         rlRun "dmesg | grep -i selinux"
     rlPhaseEnd