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

Update --cgroup-parent cli integration test to use "memory" cgroup for detecting the test's 

cgroups path instead of CPU.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
This commit is contained in:
Vishnu Kannan 2015-03-19 22:45:01 +00:00
parent 455a272aef
commit 49cb1a289f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integration-cli/docker_cli_run_unix_test.go
View File

@ -114,7 +114,7 @@ func getCgroupPaths(test string) map[string]string {
for _, line := range strings.Split(test, "\n") { for _, line := range strings.Split(test, "\n") {
parts := strings.Split(line, ":") parts := strings.Split(line, ":")
if len(parts) != 3 { if len(parts) != 3 {
fmt.Printf("unexpected file format for /proc/self/cgroup - %q", line) fmt.Printf("unexpected file format for /proc/self/cgroup - %q\n", line)
continue continue
} }
cgroupPaths[parts[1]] = parts[2] cgroupPaths[parts[1]] = parts[2]
@ -132,7 +132,7 @@ func TestRunContainerWithCgroupParent(t *testing.T) {
t.Fatalf("failed to read '/proc/self/cgroup - %v", err) t.Fatalf("failed to read '/proc/self/cgroup - %v", err)
} }
selfCgroupPaths := getCgroupPaths(string(data)) selfCgroupPaths := getCgroupPaths(string(data))
selfCpuCgroup, found := selfCgroupPaths["cpu"] selfCpuCgroup, found := selfCgroupPaths["memory"]
if !found { if !found {
t.Fatalf("unable to find self cpu cgroup path. CgroupsPath: %v", selfCgroupPaths) t.Fatalf("unable to find self cpu cgroup path. CgroupsPath: %v", selfCgroupPaths)
} }