p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

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

4
components/engine/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") {
parts := strings.Split(line, ":")
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
}
cgroupPaths[parts[1]] = parts[2]
@ -132,7 +132,7 @@ func TestRunContainerWithCgroupParent(t *testing.T) {
t.Fatalf("failed to read '/proc/self/cgroup - %v", err)
}
selfCgroupPaths := getCgroupPaths(string(data))
selfCpuCgroup, found := selfCgroupPaths["cpu"]
selfCpuCgroup, found := selfCgroupPaths["memory"]
if !found {
t.Fatalf("unable to find self cpu cgroup path. CgroupsPath: %v", selfCgroupPaths)
}