diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-03 09:31:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-03 09:31:45 -0500 |
| commit | c2a298ea933b7860c8c1f8fda8946a19d214152c (patch) | |
| tree | 3e4c3e76a36fa059f2ea867ff0f44c0a09968793 /test | |
| parent | 013770ef14f594519242c464dc9a6b0da45ce687 (diff) | |
| parent | 78036f92a2cfb4c8ca6c614d7fac919291eb9b08 (diff) | |
| download | podman-c2a298ea933b7860c8c1f8fda8946a19d214152c.tar.gz podman-c2a298ea933b7860c8c1f8fda8946a19d214152c.tar.bz2 podman-c2a298ea933b7860c8c1f8fda8946a19d214152c.zip | |
Merge pull request #9213 from edsantiago/bats_diff_workaround_v3
[v3.0] Gating tests: diff test: workaround for RHEL8 failure
Diffstat (limited to 'test')
| -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 |