From 1b34008532849467623039f78191e0f706fb34a5 Mon Sep 17 00:00:00 2001 From: Qiang Huang Date: Wed, 30 Dec 2015 15:21:34 +0800 Subject: [PATCH] Handle error for dockerCmdInDir Only two of these are not handled, the one in `TestBuildForceRm` is intended to not be handled, while the other one in `TestBuildResourceConstraintsAreUsed` causes problem. In test case `TestBuildResourceConstraintsAreUsed`, somehow we are not able to access network to get base image, but the error message is: ``` Error: failed to inspect container : Unable to read inspect data: json: cannot unmarshal array into Go value of type types.ContainerJSON ``` Totally confusion. Signed-off-by: Qiang Huang --- integration-cli/docker_cli_build_unix_test.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/integration-cli/docker_cli_build_unix_test.go b/integration-cli/docker_cli_build_unix_test.go index 644d91bca5..005399d786 100644 --- a/integration-cli/docker_cli_build_unix_test.go +++ b/integration-cli/docker_cli_build_unix_test.go @@ -21,7 +21,10 @@ func (s *DockerSuite) TestBuildResourceConstraintsAreUsed(c *check.C) { `, map[string]string{}) c.Assert(err, checker.IsNil) - dockerCmdInDir(c, ctx.Dir, "build", "--no-cache", "--rm=false", "--memory=64m", "--memory-swap=-1", "--cpuset-cpus=0", "--cpuset-mems=0", "--cpu-shares=100", "--cpu-quota=8000", "--ulimit", "nofile=42", "-t", name, ".") + _, _, err = dockerCmdInDir(c, ctx.Dir, "build", "--no-cache", "--rm=false", "--memory=64m", "--memory-swap=-1", "--cpuset-cpus=0", "--cpuset-mems=0", "--cpu-shares=100", "--cpu-quota=8000", "--ulimit", "nofile=42", "-t", name, ".") + if err != nil { + c.Fatal(err) + } out, _ := dockerCmd(c, "ps", "-lq") cID := strings.TrimSpace(out)