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

Remove debug log line from cgroup-parent feature e2e test. 

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
This commit is contained in:
Vishnu Kannan 2015-03-20 22:32:40 +00:00
parent 57f061211a
commit a7639c2e1f
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
integration-cli/docker_cli_run_unix_test.go
View File

@ -109,23 +109,6 @@ func TestRunWithUlimits(t *testing.T) {
logDone("run - ulimits are set") logDone("run - ulimits are set")
} }
func getCgroupPaths(test string) map[string]string {
cgroupPaths := map[string]string{}
for _, line := range strings.Split(test, "\n") {
line = strings.TrimSpace(line)
if line == "" {
continue
}
parts := strings.Split(line, ":")
if len(parts) != 3 {
fmt.Printf("unexpected file format for /proc/self/cgroup - %q\n", line)
continue
}
cgroupPaths[parts[1]] = parts[2]
}
return cgroupPaths
}
func TestRunContainerWithCgroupParent(t *testing.T) { func TestRunContainerWithCgroupParent(t *testing.T) {
testRequires(t, NativeExecDriver) testRequires(t, NativeExecDriver)
defer deleteAllContainers() defer deleteAllContainers()
@ -135,7 +118,7 @@ func TestRunContainerWithCgroupParent(t *testing.T) {
if err != nil { if err != nil {
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 := parseCgroupPaths(string(data))
selfCpuCgroup, found := selfCgroupPaths["memory"] 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)
@ -145,7 +128,7 @@ func TestRunContainerWithCgroupParent(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err) t.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err)
} }
cgroupPaths := getCgroupPaths(string(out)) cgroupPaths := parseCgroupPaths(string(out))
if len(cgroupPaths) == 0 { if len(cgroupPaths) == 0 {
t.Fatalf("unexpected output - %q", string(out)) t.Fatalf("unexpected output - %q", string(out))
} }
@ -173,7 +156,7 @@ func TestRunContainerWithCgroupParentAbsPath(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err) t.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err)
} }
cgroupPaths := getCgroupPaths(string(out)) cgroupPaths := parseCgroupPaths(string(out))
if len(cgroupPaths) == 0 { if len(cgroupPaths) == 0 {
t.Fatalf("unexpected output - %q", string(out)) t.Fatalf("unexpected output - %q", string(out))
} }

14
integration-cli/utils.go
View File

@ -328,3 +328,17 @@ func consumeWithSpeed(reader io.Reader, chunkSize int, interval time.Duration, s
} }
} }
} }
// Parses 'procCgroupData', which is output of '/proc/<pid>/cgroup', and returns
// a map which cgroup name as key and path as value.
func parseCgroupPaths(procCgroupData string) map[string]string {
cgroupPaths := map[string]string{}
for _, line := range strings.Split(procCgroupData, "\n") {
parts := strings.Split(line, ":")
if len(parts) != 3 {
continue
}
cgroupPaths[parts[1]] = parts[2]
}
return cgroupPaths
}