diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-03 06:41:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-03 06:41:24 -0500 |
| commit | ec0041ebfff5b6a040a61baa3ffbc2348fe65a0e (patch) | |
| tree | 5c1b404c5bea72ea6025033aa6a0cab0422b6346 /test/system | |
| parent | 97421651d3821a03eab319befdedcf554c31a2f9 (diff) | |
| parent | e0bc8ffb5932ce93a40b8a58f7f0a253db98a588 (diff) | |
| download | podman-ec0041ebfff5b6a040a61baa3ffbc2348fe65a0e.tar.gz podman-ec0041ebfff5b6a040a61baa3ffbc2348fe65a0e.tar.bz2 podman-ec0041ebfff5b6a040a61baa3ffbc2348fe65a0e.zip | |
Merge pull request #9209 from edsantiago/bats_diff_workaround
Gating tests: diff test: workaround for RHEL8 failure
Diffstat (limited to 'test/system')
| -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 |