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

Migrate integration test to new method

Browse Source 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Upstream-commit: 9dbe12b792a46538c01862930c85ace18dbe14f3
Component: engine
This commit is contained in:
Nathan LeClaire
2015-04-25 17:12:01 -04:00
parent b3b4c052f9
commit 04f8bd2003
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_build_test.go
+6 -7
View File
@@ -5252,20 +5252,20 @@ func (s *DockerSuite) TestBuildEmptyStringVolume(c *check.C) {
}
func TestBuildContainerWithCgroupParent(t *testing.T) {
testRequires(t, NativeExecDriver)
testRequires(t, SameHostDaemon)
func (s *DockerSuite) TestBuildContainerWithCgroupParent(c *check.C) {
testRequires(c, NativeExecDriver)
testRequires(c, SameHostDaemon)
defer deleteImages()
cgroupParent := "test"
data, err := ioutil.ReadFile("/proc/self/cgroup")
if err != nil {
t.Fatalf("failed to read '/proc/self/cgroup - %v", err)
c.Fatalf("failed to read '/proc/self/cgroup - %v", err)
}
selfCgroupPaths := parseCgroupPaths(string(data))
_, found := selfCgroupPaths["memory"]
if !found {
t.Fatalf("unable to find self cpu cgroup path. CgroupsPath: %v", selfCgroupPaths)
c.Fatalf("unable to find self cpu cgroup path. CgroupsPath: %v", selfCgroupPaths)
}
cmd := exec.Command(dockerBinary, "build", "--cgroup-parent", cgroupParent, "-")
cmd.Stdin = strings.NewReader(`
@@ -5275,7 +5275,6 @@ RUN cat /proc/self/cgroup
out, _, err := runCommandWithOutput(cmd)
if err != nil {
t.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err)
c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err)
}
logDone("build - cgroup parent")
}