1. docker
  2. Commit a9afebae6240cfd48a93c182cbbdff4f09d6a6a0
Browse code

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>

Daehyeok Mun authored on 2015/11/16 07:00:39
Showing 2 changed files
integration-cli/docker_api_containers_test.go
History View file @ a9afeba
... ... 
@@ -791,7 +791,7 @@ func (s *DockerSuite) TestContainerApiCreateWithCpuSharesCpuset(c *check.C) {
791 791 
 	config := map[string]interface{}{
792 792 
 		"Image":      "busybox",
793 793 
 		"CpuShares":  512,
794 
-		"CpusetCpus": "0,1",
794 
+		"CpusetCpus": "0",
795 795 
 	}
796 796
797 797 
 	status, body, err := sockRequest("POST", "/containers/create", config)
... ... 
@@ -817,7 +817,7 @@ func (s *DockerSuite) TestContainerApiCreateWithCpuSharesCpuset(c *check.C) {
817 817
818 818 
 	outCpuset, errCpuset := inspectField(containerJSON.ID, "HostConfig.CpusetCpus")
819 819 
 	c.Assert(errCpuset, check.IsNil, check.Commentf("Output: %s", outCpuset))
820 
-	c.Assert(outCpuset, check.Equals, "0,1")
820 
+	c.Assert(outCpuset, check.Equals, "0")
821 821 
 }
822 822
823 823 
 func (s *DockerSuite) TestContainerApiVerifyHeader(c *check.C) {
integration-cli/docker_api_inspect_unix_test.go
History View file @ a9afeba
... ... 
@@ -16,7 +16,7 @@ func (s *DockerSuite) TestInspectApiCpusetInConfigPre120(c *check.C) {
16 16 
 	testRequires(c, cgroupCpuset)
17 17
18 18 
 	name := "cpusetinconfig-pre120"
19 
-	dockerCmd(c, "run", "--name", name, "--cpuset-cpus", "0-1", "busybox", "true")
19 
+	dockerCmd(c, "run", "--name", name, "--cpuset-cpus", "0", "busybox", "true")
20 20
21 21 
 	status, body, err := sockRequest("GET", fmt.Sprintf("/v1.19/containers/%s/json", name), nil)
22 22 
 	c.Assert(status, check.Equals, http.StatusOK)