Przeglądaj źródła

Clean up integration-cli/docker_api_version_test.go

Signed-off-by: Kevin P. Kucharczyk <kevinkucharczyk@gmail.com>
Kevin P. Kucharczyk 9 lat temu
rodzic
commit
6f1b5946b1
1 zmienionych plików z 6 dodań i 8 usunięć
  1. 6 8
      integration-cli/docker_api_version_test.go

+ 6 - 8
integration-cli/docker_api_version_test.go

@@ -6,20 +6,18 @@ import (
 
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/autogen/dockerversion"
 	"github.com/docker/docker/autogen/dockerversion"
+	"github.com/docker/docker/pkg/integration/checker"
 	"github.com/go-check/check"
 	"github.com/go-check/check"
 )
 )
 
 
 func (s *DockerSuite) TestGetVersion(c *check.C) {
 func (s *DockerSuite) TestGetVersion(c *check.C) {
 	status, body, err := sockRequest("GET", "/version", nil)
 	status, body, err := sockRequest("GET", "/version", nil)
-	c.Assert(status, check.Equals, http.StatusOK)
-	c.Assert(err, check.IsNil)
+	c.Assert(status, checker.Equals, http.StatusOK)
+	c.Assert(err, checker.IsNil)
 
 
 	var v types.Version
 	var v types.Version
-	if err := json.Unmarshal(body, &v); err != nil {
-		c.Fatal(err)
-	}
 
 
-	if v.Version != dockerversion.VERSION {
-		c.Fatal("Version mismatch")
-	}
+	c.Assert(json.Unmarshal(body, &v), checker.IsNil)
+
+	c.Assert(v.Version, checker.Equals, dockerversion.VERSION, check.Commentf("Version mismatch"))
 }
 }