summaryrefslogtreecommitdiff
path: root/test/system/helpers.bash
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2020-09-28 09:55:37 -0600
committerEd Santiago <santiago@redhat.com>2020-09-28 13:59:42 -0600
commit1f78d33f7600283a235ca04d4cb0f2b2ac550927 (patch)
tree56a97c7e71f72edf2a3a918d4c67f74adb7a6982 /test/system/helpers.bash
parentb0e70a6411d70d7ee7f1e9d6abedc2524b903609 (diff)
downloadpodman-1f78d33f7600283a235ca04d4cb0f2b2ac550927.tar.gz
podman-1f78d33f7600283a235ca04d4cb0f2b2ac550927.tar.bz2
podman-1f78d33f7600283a235ca04d4cb0f2b2ac550927.zip
System tests: reenable some skipped tests
- pause test: enable when rootless + cgroups v2 (was previously disabled for all rootless) - run --pull: now works with podman-remote (in #7647, thank you @jwhonce) - various other run/volumes tests: try reenabling It looks like #7195 was fixed (by #7451? I'm not sure if I'm reading the conversation correctly). Anyway, remove all the skip()s on 7195. Only time will tell if it's really fixed) Also: - new test for podman image tree --whatrequires (because TIL). Doesn't work with podman-remote. Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/system/helpers.bash')
-rw-r--r--test/system/helpers.bash10
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
###########################