From a9afebae6240cfd48a93c182cbbdff4f09d6a6a0 Mon Sep 17 00:00:00 2001 From: Daehyeok Mun Date: Sun, 15 Nov 2015 15:00:39 -0700 Subject: [PATCH] Modified cpuset test for unicore test environment Modified TestInspectApiCpusetInConfigPre120 and TestContainerApiCreateWithCpuSharesCpuset for working on unicore cpu environment. Signed-off-by: Daehyeok Mun --- integration-cli/docker_api_containers_test.go | 4 ++-- integration-cli/docker_api_inspect_unix_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-cli/docker_api_containers_test.go b/integration-cli/docker_api_containers_test.go index b1e316c7f4..216c20f200 100644 --- a/integration-cli/docker_api_containers_test.go +++ b/integration-cli/docker_api_containers_test.go @@ -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) { diff --git a/integration-cli/docker_api_inspect_unix_test.go b/integration-cli/docker_api_inspect_unix_test.go index 9f459e4ff5..dc9bfb5ec7 100644 --- a/integration-cli/docker_api_inspect_unix_test.go +++ b/integration-cli/docker_api_inspect_unix_test.go @@ -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)