From 49cb1a289f19565132824e67bb83a2e255b13c8a Mon Sep 17 00:00:00 2001
From: Vishnu Kannan <vishnuk@google.com>
Date: Thu, 19 Mar 2015 22:45:01 +0000
Subject: [PATCH] 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)
---
integration-cli/docker_cli_run_unix_test.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go
index c2682b4ac6..e328b74848 100644
--- a/integration-cli/docker_cli_run_unix_test.go
+++ b/integration-cli/docker_cli_run_unix_test.go
@@ -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)
}