Modified cpuset test for unicore test environment
Modified TestInspectApiCpusetInConfigPre120 and TestContainerApiCreateWithCpuSharesCpuset for working on unicore cpu environment. Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
This commit is contained in:
parent
aeccd45e5b
commit
a9afebae62
|
@ -791,7 +791,7 @@ func (s *DockerSuite) TestContainerApiCreateWithCpuSharesCpuset(c *check.C) {
|
||||||
config := map[string]interface{}{
|
config := map[string]interface{}{
|
||||||
"Image": "busybox",
|
"Image": "busybox",
|
||||||
"CpuShares": 512,
|
"CpuShares": 512,
|
||||||
"CpusetCpus": "0,1",
|
"CpusetCpus": "0",
|
||||||
}
|
}
|
||||||
|
|
||||||
status, body, err := sockRequest("POST", "/containers/create", config)
|
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")
|
outCpuset, errCpuset := inspectField(containerJSON.ID, "HostConfig.CpusetCpus")
|
||||||
c.Assert(errCpuset, check.IsNil, check.Commentf("Output: %s", outCpuset))
|
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) {
|
func (s *DockerSuite) TestContainerApiVerifyHeader(c *check.C) {
|
||||||
|
|
|
@ -16,7 +16,7 @@ func (s *DockerSuite) TestInspectApiCpusetInConfigPre120(c *check.C) {
|
||||||
testRequires(c, cgroupCpuset)
|
testRequires(c, cgroupCpuset)
|
||||||
|
|
||||||
name := "cpusetinconfig-pre120"
|
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)
|
status, body, err := sockRequest("GET", fmt.Sprintf("/v1.19/containers/%s/json", name), nil)
|
||||||
c.Assert(status, check.Equals, http.StatusOK)
|
c.Assert(status, check.Equals, http.StatusOK)
|
||||||
|
|
Loading…
Reference in New Issue