Merge pull request #9209 from edsantiago/bats_diff_workaround

Gating tests: diff test: workaround for RHEL8 failure

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