[tests/selinux] pr775-checkpolicy-revdeps: selinux-restorecon-functions: Pattern in extended attribute has changed

[tests/selinux] pr775-checkpolicy-revdeps: selinux-restorecon-functions: Pattern in extended attribute has changed

[Richard Filo]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : 954aa8c2a666db74cdc824f419be07a89bf4601a
            Author : Richard Filo <rfilo@redhat.com>
            Date   : 2020-03-28T14:29:49+01:00
            Stats  : +2/-2 in 1 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/954aa8c2a666db74cdc824f419be07a89bf4601a?branch=pr775-checkpolicy-revdeps

            Log:
            selinux-restorecon-functions: Pattern in extended attribute has changed

Selinux_restorecon() applies a different extended attribute.

Name of security.restorecon_last extended attribute was changed to security.sehash in that commit:
https://github.com/fedora-selinux/selinux/commit/e016502c0a265d661a3a4b541b865eec94aae2b1

Fixes:
https://src.fedoraproject.org/tests/selinux/issue/52

---
diff --git a/libselinux/selinux_restorecon-functions/runtest.sh b/libselinux/selinux_restorecon-functions/runtest.sh
index dbaec0f..2f1b7bd 100755
--- a/libselinux/selinux_restorecon-functions/runtest.sh
+++ b/libselinux/selinux_restorecon-functions/runtest.sh
@@ -188,12 +188,12 @@ rlJournalStart
         # directory that supports security.restorecon_last xattr
         rlRun "strace -ostrace.out -s 64 ./test_restorecon /var/log RECURSE NOCHANGE" 0 "Calling selinux_restorecon on /tmp"
 
-        rlRun "grep security.restorecon_last strace.out" 0
+        rlRun "grep -E \"security\.(restorecon_last|sehash)\" strace.out" 0
 
         # directory that does not supports security.restorecon_last xattr
         rlRun "strace -ostrace.out -s 64 ./test_restorecon /sys RECURSE NOCHANGE" 0 "Calling selinux_restorecon on /sys"
 
-        rlRun "grep security.restorecon_last strace.out" 1
+        rlRun "grep -E \"security\.(restorecon_last|sehash)\" strace.out" 1
 
         rlRun "rm -f strace.out"
     rlPhaseEnd