From d53a9bcb13f7a37c8735c9ff4c336b7f021c6137 Mon Sep 17 00:00:00 2001 From: Aditi Rajagopal Date: Mon, 23 Nov 2015 22:01:23 -0500 Subject: [PATCH] Checkers on docker_api_inspect_unix_test.go Applying #16756 to integration-cli/docker_api_inspect_unix_test.go Signed-off-by: Aditi Rajagopal --- integration-cli/docker_api_inspect_unix_test.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/integration-cli/docker_api_inspect_unix_test.go b/integration-cli/docker_api_inspect_unix_test.go index dc9bfb5ec7..fe59860d5a 100644 --- a/integration-cli/docker_api_inspect_unix_test.go +++ b/integration-cli/docker_api_inspect_unix_test.go @@ -7,6 +7,7 @@ import ( "fmt" "net/http" + "github.com/docker/docker/pkg/integration/checker" "github.com/go-check/check" ) @@ -23,16 +24,12 @@ func (s *DockerSuite) TestInspectApiCpusetInConfigPre120(c *check.C) { c.Assert(err, check.IsNil) var inspectJSON map[string]interface{} - if err = json.Unmarshal(body, &inspectJSON); err != nil { - c.Fatalf("unable to unmarshal body for version 1.19: %v", err) - } + err = json.Unmarshal(body, &inspectJSON) + c.Assert(err, checker.IsNil, check.Commentf("unable to unmarshal body for version 1.19")) config, ok := inspectJSON["Config"] - if !ok { - c.Fatal("Unable to find 'Config'") - } + c.Assert(ok, checker.True, check.Commentf("Unable to find 'Config'")) cfg := config.(map[string]interface{}) - if _, ok := cfg["Cpuset"]; !ok { - c.Fatal("Api version 1.19 expected to include Cpuset in 'Config'") - } + _, ok = cfg["Cpuset"] + c.Assert(ok, checker.True, check.Commentf("Api version 1.19 expected to include Cpuset in 'Config'")) }