diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-29 01:45:20 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-29 01:45:20 +0000 |
commit | 4a7fb62adcbb8d5f2bc8e45273748301d12375a7 (patch) | |
tree | ca0a74a6c5f94e4351681fd05e115c17ea4a6f5e /test/system/helpers.bash | |
parent | e7e466e0c80339e252d748e5aa5d54a6962da7b4 (diff) | |
parent | 1f78d33f7600283a235ca04d4cb0f2b2ac550927 (diff) | |
download | podman-4a7fb62adcbb8d5f2bc8e45273748301d12375a7.tar.gz podman-4a7fb62adcbb8d5f2bc8e45273748301d12375a7.tar.bz2 podman-4a7fb62adcbb8d5f2bc8e45273748301d12375a7.zip |
Merge pull request #7803 from edsantiago/bats
System tests: reenable some skipped tests
Diffstat (limited to 'test/system/helpers.bash')
-rw-r--r-- | test/system/helpers.bash | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/test/system/helpers.bash b/test/system/helpers.bash index 78571901d..eb3e4c7ec 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -240,6 +240,16 @@ function is_remote() { [[ "$PODMAN" =~ -remote ]] } +function is_cgroupsv1() { + # WARNING: This will break if there's ever a cgroups v3 + ! is_cgroupsv2 +} + +function is_cgroupsv2() { + cgroup_type=$(stat -f -c %T /sys/fs/cgroup) + test "$cgroup_type" = "cgroupfs" +} + ########################### # _add_label_if_missing # make sure skip messages include rootless/remote ########################### |