From 6694326d5d23ab866d1fccf1f9cbcedfd8a31e85 Mon Sep 17 00:00:00 2001 From: Zuhayr Elahi Date: Wed, 21 Oct 2015 20:30:54 -0700 Subject: [PATCH] Added c.Assert statements to docker_api_create_test.go removed the if/else statements and added c.Assert statements for docker_api_create_test.go. Removed check.commentf in c.Assert statements Signed-off-by: Zuhayr Elahi --- integration-cli/docker_api_create_test.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/integration-cli/docker_api_create_test.go b/integration-cli/docker_api_create_test.go index 96e4dc3689..bfa11ff0ff 100644 --- a/integration-cli/docker_api_create_test.go +++ b/integration-cli/docker_api_create_test.go @@ -4,6 +4,7 @@ import ( "net/http" "strings" + "github.com/docker/docker/pkg/integration/checker" "github.com/go-check/check" ) @@ -18,9 +19,7 @@ func (s *DockerSuite) TestApiCreateWithNotExistImage(c *check.C) { c.Assert(err, check.IsNil) c.Assert(status, check.Equals, http.StatusNotFound) expected := "No such image: test456:v1" - if !strings.Contains(string(resp), expected) { - c.Fatalf("expected: %s, got: %s", expected, string(resp)) - } + c.Assert(strings.TrimSpace(string(resp)), checker.Contains, expected) config2 := map[string]interface{}{ "Image": "test456", @@ -31,8 +30,6 @@ func (s *DockerSuite) TestApiCreateWithNotExistImage(c *check.C) { c.Assert(err, check.IsNil) c.Assert(status, check.Equals, http.StatusNotFound) expected = "No such image: test456:latest" - if !strings.Contains(string(resp), expected) { - c.Fatalf("expected: %s, got: %s", expected, string(resp)) - } + c.Assert(strings.TrimSpace(string(resp)), checker.Equals, expected) }