From a7639c2e1f377b1f5903bb6435473cba4db6522f Mon Sep 17 00:00:00 2001
From: Vishnu Kannan <vishnuk@google.com>
Date: Fri, 20 Mar 2015 22:32:40 +0000
Subject: [PATCH] Remove debug log line from cgroup-parent feature e2e test.
 Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github:
 vishh)

---
 integration-cli/docker_cli_run_unix_test.go | 23 +++------------------
 integration-cli/utils.go                    | 14 +++++++++++++
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go
index 6fe416f9d2..9327ac240a 100644
--- a/integration-cli/docker_cli_run_unix_test.go
+++ b/integration-cli/docker_cli_run_unix_test.go
@@ -109,23 +109,6 @@ func TestRunWithUlimits(t *testing.T) {
 	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) {
 	testRequires(t, NativeExecDriver)
 	defer deleteAllContainers()
@@ -135,7 +118,7 @@ func TestRunContainerWithCgroupParent(t *testing.T) {
 	if err != nil {
 		t.Fatalf("failed to read '/proc/self/cgroup - %v", err)
 	}
-	selfCgroupPaths := getCgroupPaths(string(data))
+	selfCgroupPaths := parseCgroupPaths(string(data))
 	selfCpuCgroup, found := selfCgroupPaths["memory"]
 	if !found {
 		t.Fatalf("unable to find self cpu cgroup path. CgroupsPath: %v", selfCgroupPaths)
@@ -145,7 +128,7 @@ func TestRunContainerWithCgroupParent(t *testing.T) {
 	if err != nil {
 		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 {
 		t.Fatalf("unexpected output - %q", string(out))
 	}
@@ -173,7 +156,7 @@ func TestRunContainerWithCgroupParentAbsPath(t *testing.T) {
 	if err != nil {
 		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 {
 		t.Fatalf("unexpected output - %q", string(out))
 	}
diff --git a/integration-cli/utils.go b/integration-cli/utils.go
index 691402f35e..7560854989 100644
--- a/integration-cli/utils.go
+++ b/integration-cli/utils.go
@@ -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
+}