0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #18000 from daehyeok/fix_dry_run_test

Browse source 
Modified cpuset test for unicore test environment
This commit is contained in:
Michael Crosby 2015-11-17 15:15:09 -08:00
commit ca0b41e337
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
integration-cli/docker_api_containers_test.go
View file

@ -791,7 +791,7 @@ func (s *DockerSuite) TestContainerApiCreateWithCpuSharesCpuset(c *check.C) {
config := map[string]interface{}{
"Image": "busybox",
"CpuShares": 512,
"CpusetCpus": "0,1",
"CpusetCpus": "0",
}
status, body, err := sockRequest("POST", "/containers/create", config)
@ -817,7 +817,7 @@ func (s *DockerSuite) TestContainerApiCreateWithCpuSharesCpuset(c *check.C) {
outCpuset, errCpuset := inspectField(containerJSON.ID, "HostConfig.CpusetCpus")
c.Assert(errCpuset, check.IsNil, check.Commentf("Output: %s", outCpuset))
c.Assert(outCpuset, check.Equals, "0,1")
c.Assert(outCpuset, check.Equals, "0")
}
func (s *DockerSuite) TestContainerApiVerifyHeader(c *check.C) {

2
integration-cli/docker_api_inspect_unix_test.go
View file

@ -16,7 +16,7 @@ func (s *DockerSuite) TestInspectApiCpusetInConfigPre120(c *check.C) {
testRequires(c, cgroupCpuset)
name := "cpusetinconfig-pre120"
dockerCmd(c, "run", "--name", name, "--cpuset-cpus", "0-1", "busybox", "true")
dockerCmd(c, "run", "--name", name, "--cpuset-cpus", "0", "busybox", "true")
status, body, err := sockRequest("GET", fmt.Sprintf("/v1.19/containers/%s/json", name), nil)
c.Assert(status, check.Equals, http.StatusOK)