From 1646da834c06d55e7bf56b272f2666659117e6fa Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 14 Oct 2020 06:24:17 -0600 Subject: System test additions - run --userns=keep-id: confirm that $HOME gets set (#8013) - inspect: confirm that JSON output is a sane number of lines (10 or more), not an unreadable one-liner (#8011 and #8021). Do so with image, pod, network, volume because the code paths might be different. - cgroups: confirm that 'run' preserves cgroup manager (#7970) - sdnotify: reenable tests, and hope CI doesn't hang. This test was disabled on August 18 because CI jobs were hanging and timing out. My suspicion was that it was #7316, which in turn seems to have hinged on conmon #182. The latter was merged on Sep 16, so let's cross our fingers and see what happens. Also: remove inaccurate warning from a networking test. And, wow, fix is_cgroupsv2(), it has never actually worked. Signed-off-by: Ed Santiago --- test/system/helpers.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/system/helpers.bash') diff --git a/test/system/helpers.bash b/test/system/helpers.bash index c6c2c12df..4591c9015 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -247,7 +247,7 @@ function is_cgroupsv1() { function is_cgroupsv2() { cgroup_type=$(stat -f -c %T /sys/fs/cgroup) - test "$cgroup_type" = "cgroupfs" + test "$cgroup_type" = "cgroup2fs" } ########################### -- cgit v1.2.3-54-g00ecf