[WIP] Cgroupv2: fix test

This commit is contained in:
Miao Wang 2021-07-25 12:12:49 +08:00
parent 2c4d2d6ae0
commit 28d160a7f0

View File

@ -8,6 +8,7 @@ import (
"strings" "strings"
"testing" "testing"
"time" "time"
cgv1 "github.com/containerd/cgroups"
units "github.com/docker/go-units" units "github.com/docker/go-units"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
@ -147,11 +148,15 @@ sleep 30
logger.Errorf("Failed to create cgroup") logger.Errorf("Failed to create cgroup")
return return
} }
if cg.subsystem == "memory" { So(cg.cgMgrV1, ShouldNotBeNil)
memoLimit, err := ioutil.ReadFile(filepath.Join(cg.basePath, "memory", cg.baseGroup, provider.Name(), "memory.limit_in_bytes")) for _, subsys := range(cg.cgMgrV1.Subsystems()) {
So(err, ShouldBeNil) if subsys.Name() == cgv1.Memory {
So(strings.Trim(string(memoLimit), "\n"), ShouldEqual, strconv.Itoa(512*1024*1024)) memoLimit, err := ioutil.ReadFile(filepath.Join(cgcf.BasePath, "memory", cgcf.Group, provider.Name(), "memory.limit_in_bytes"))
So(err, ShouldBeNil)
So(strings.Trim(string(memoLimit), "\n"), ShouldEqual, strconv.Itoa(512*1024*1024))
}
} }
cg.postExec() cg.postExec()
So(cg.cgMgrV1, ShouldBeNil)
}) })
} }