From df9450925b2335790108860e7dba389e24fa5f7d Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 24 Apr 2020 17:30:47 +0200 Subject: test: fix check for pause on cgroup v2 There is no freezer controller in the cgroup root, use the current cgroup to look it up. The test was never running on cgroup v2. Signed-off-by: Giuseppe Scrivano --- test/e2e/pause_test.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go index 6ef27fa05..149a2e28a 100644 --- a/test/e2e/pause_test.go +++ b/test/e2e/pause_test.go @@ -2,7 +2,9 @@ package integration import ( "fmt" + "io/ioutil" "os" + "path/filepath" "strings" "github.com/containers/libpod/pkg/cgroups" @@ -32,7 +34,13 @@ var _ = Describe("Podman pause", func() { Expect(err).To(BeNil()) if cgroupsv2 { - _, err := os.Stat("/sys/fs/cgroup/cgroup.freeze") + b, err := ioutil.ReadFile("/proc/self/cgroup") + if err != nil { + Skip("cannot read self cgroup") + } + + path := filepath.Join("/sys/fs/cgroup", strings.TrimSuffix(strings.Replace(string(b), "0::", "", 1), "\n"), "cgroup.freeze") + _, err = os.Stat(path) if err != nil { Skip("freezer controller not available on the current kernel") } -- cgit v1.2.3-54-g00ecf