docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14812 from LK4D4/fix_cgroup_parent_tests 

Fix cgroup parent tests
This commit is contained in:
Jessie Frazelle 2015-07-21 19:53:48 -07:00
parent dda1d66ac7 844fc5f77c
commit 7a06e85270
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
integration-cli/docker_cli_run_unix_test.go
View File

@ -100,17 +100,9 @@ func (s *DockerSuite) TestRunContainerWithCgroupParent(c *check.C) {
testRequires(c, NativeExecDriver) testRequires(c, NativeExecDriver)
cgroupParent := "test" cgroupParent := "test"
data, err := ioutil.ReadFile("/proc/self/cgroup") name := "cgroup-test"
if err != nil {
c.Fatalf("failed to read '/proc/self/cgroup - %v", err)
}
selfCgroupPaths := parseCgroupPaths(string(data))
selfCpuCgroup, found := selfCgroupPaths["memory"]
if !found {
c.Fatalf("unable to find self cpu cgroup path. CgroupsPath: %v", selfCgroupPaths)
}
out, _, err := dockerCmdWithError(c, "run", "--cgroup-parent", cgroupParent, "--rm", "busybox", "cat", "/proc/self/cgroup") out, _, err := dockerCmdWithError(c, "run", "--cgroup-parent", cgroupParent, "--name", name, "busybox", "cat", "/proc/self/cgroup")
if err != nil { if err != nil {
c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err) c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err)
} }
@ -118,16 +110,18 @@ func (s *DockerSuite) TestRunContainerWithCgroupParent(c *check.C) {
if len(cgroupPaths) == 0 { if len(cgroupPaths) == 0 {
c.Fatalf("unexpected output - %q", string(out)) c.Fatalf("unexpected output - %q", string(out))
} }
found = false id, err := getIDByName(name)
expectedCgroupPrefix := path.Join(selfCpuCgroup, cgroupParent) c.Assert(err, check.IsNil)
expectedCgroup := path.Join(cgroupParent, id)
found := false
for _, path := range cgroupPaths { for _, path := range cgroupPaths {
if strings.HasPrefix(path, expectedCgroupPrefix) { if strings.HasSuffix(path, expectedCgroup) {
found = true found = true
break break
} }
} }
if !found { if !found {
c.Fatalf("unexpected cgroup paths. Expected at least one cgroup path to have prefix %q. Cgroup Paths: %v", expectedCgroupPrefix, cgroupPaths) c.Fatalf("unexpected cgroup paths. Expected at least one cgroup path to have suffix %q. Cgroup Paths: %v", expectedCgroup, cgroupPaths)
} }
} }
@ -135,7 +129,8 @@ func (s *DockerSuite) TestRunContainerWithCgroupParentAbsPath(c *check.C) {
testRequires(c, NativeExecDriver) testRequires(c, NativeExecDriver)
cgroupParent := "/cgroup-parent/test" cgroupParent := "/cgroup-parent/test"
out, _, err := dockerCmdWithError(c, "run", "--cgroup-parent", cgroupParent, "--rm", "busybox", "cat", "/proc/self/cgroup") name := "cgroup-test"
out, _, err := dockerCmdWithError(c, "run", "--cgroup-parent", cgroupParent, "--name", name, "busybox", "cat", "/proc/self/cgroup")
if err != nil { if err != nil {
c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err) c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err)
} }
@ -143,15 +138,18 @@ func (s *DockerSuite) TestRunContainerWithCgroupParentAbsPath(c *check.C) {
if len(cgroupPaths) == 0 { if len(cgroupPaths) == 0 {
c.Fatalf("unexpected output - %q", string(out)) c.Fatalf("unexpected output - %q", string(out))
} }
id, err := getIDByName(name)
c.Assert(err, check.IsNil)
expectedCgroup := path.Join(cgroupParent, id)
found := false found := false
for _, path := range cgroupPaths { for _, path := range cgroupPaths {
if strings.HasPrefix(path, cgroupParent) { if strings.HasSuffix(path, expectedCgroup) {
found = true found = true
break break
} }
} }
if !found { if !found {
c.Fatalf("unexpected cgroup paths. Expected at least one cgroup path to have prefix %q. Cgroup Paths: %v", cgroupParent, cgroupPaths) c.Fatalf("unexpected cgroup paths. Expected at least one cgroup path to have suffix %q. Cgroup Paths: %v", expectedCgroup, cgroupPaths)
} }
} }