diff options
| author | Ed Santiago <santiago@redhat.com> | 2021-02-02 14:36:19 -0700 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2021-02-03 05:25:17 -0700 |
| commit | 78036f92a2cfb4c8ca6c614d7fac919291eb9b08 (patch) | |
| tree | dfc059f1129277bc7162d572a14d982e4e0eb262 | |
| parent | 715a7518a793f5790e4c7db4600f03447915c037 (diff) | |
| download | podman-78036f92a2cfb4c8ca6c614d7fac919291eb9b08.tar.gz podman-78036f92a2cfb4c8ca6c614d7fac919291eb9b08.tar.bz2 podman-78036f92a2cfb4c8ca6c614d7fac919291eb9b08.zip | |
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>
| -rw-r--r-- | test/system/140-diff.bats | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/system/140-diff.bats b/test/system/140-diff.bats index 1277f9bbe..02b3a86ca 100644 --- a/test/system/140-diff.bats +++ b/test/system/140-diff.bats @@ -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 |