Gating tests: diff test: workaround for RHEL8 failure

RHEL8 rootless gating tests are inconsistently failing with:

   $ podman diff --format json -l
   #
   {"changed":["/etc"],"added":["/sys/fs","/sys/fs/cgroup","/pMOm1Q0fnN"],"deleted":["/etc/services"]}
   # #/vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
   # #|     FAIL: added
   # #| expected: '/pMOm1Q0fnN'
   # #|   actual: '/sys/fs'
   # #|         > '/sys/fs/cgroup'
   # #|         > '/pMOm1Q0fnN'
   # #\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Reason: PR #8561, I think (something to do with /sys on RHEL).

Workaround: ignore '/sys/fs' in diffs.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago 2021-02-02 14:36:19 -07:00
parent d1e0afdd47
commit e0bc8ffb59
1 changed files with 6 additions and 1 deletions

View File

@ -25,7 +25,12 @@ load helpers
)
for field in ${!expect[@]}; do
result=$(jq -r -c ".${field}[]" <<<"$output")
# ARGH! The /sys/fs kludgery is for RHEL8 rootless, which mumble mumble
# does some sort of magic muckery with /sys - I think the relevant
# PR is https://github.com/containers/podman/pull/8561
# Anyhow, without the egrep below, this test fails about 50% of the
# time on rootless RHEL8. (No, I don't know why it's not 100%).
result=$(jq -r -c ".${field}[]" <<<"$output" | egrep -v '^/sys/fs')
is "$result" "${expect[$field]}" "$field"
done