18992: Fix abrupt exit on cgroup test failure.

[arvados.git] / lib / crunchrun / cgroup_test.go

diff --git a/lib/crunchrun/cgroup_test.go b/lib/crunchrun/cgroup_test.go
index b43479a3b4ae02379cff1f60d33c532a510a7f46..eb87456d14b0d1e0e60245460009d75cfe4a01b2 100644 (file)
--- a/lib/crunchrun/cgroup_test.go
+++ b/lib/crunchrun/cgroup_test.go
@@ -14,8 +14,10 @@ var _ = Suite(&CgroupSuite{})
 
 func (s *CgroupSuite) TestFindCgroup(c *C) {
        for _, s := range []string{"devices", "cpu", "cpuset"} {
-               g := findCgroup(s)
-               c.Check(g, Not(Equals), "")
+               g, err := findCgroup(s)
+               if c.Check(err, IsNil) {
+                       c.Check(g, Not(Equals), "", Commentf("subsys %q", s))
+               }
                c.Logf("cgroup(%q) == %q", s, g)
        }
 }