From 278e75800c7be10ca43ffb11de25cd342da106fe Mon Sep 17 00:00:00 2001 From: Aditi Rajagopal Date: Fri, 18 Dec 2015 15:28:17 -0500 Subject: [PATCH] pkg/version.Version: use the new String() method Resolves #18750 Signed-off-by: Aditi Rajagopal --- api/client/cli.go | 2 +- integration-cli/docker_api_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/client/cli.go b/api/client/cli.go index 31e1572da9..47258b278d 100644 --- a/api/client/cli.go +++ b/api/client/cli.go @@ -104,7 +104,7 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, clientFlags *cli.ClientF } customHeaders["User-Agent"] = "Docker-Client/" + dockerversion.Version + " (" + runtime.GOOS + ")" - verStr := string(api.DefaultVersion) + verStr := api.DefaultVersion.String() if tmpStr := os.Getenv("DOCKER_API_VERSION"); tmpStr != "" { verStr = tmpStr } diff --git a/integration-cli/docker_api_test.go b/integration-cli/docker_api_test.go index a5fc57c297..5c213a1903 100644 --- a/integration-cli/docker_api_test.go +++ b/integration-cli/docker_api_test.go @@ -49,7 +49,7 @@ func (s *DockerSuite) TestApiVersionStatusCode(c *check.C) { } func (s *DockerSuite) TestApiClientVersionNewerThanServer(c *check.C) { - v := strings.Split(string(api.DefaultVersion), ".") + v := strings.Split(api.DefaultVersion.String(), ".") vMinInt, err := strconv.Atoi(v[1]) c.Assert(err, checker.IsNil) vMinInt++ @@ -63,7 +63,7 @@ func (s *DockerSuite) TestApiClientVersionNewerThanServer(c *check.C) { } func (s *DockerSuite) TestApiClientVersionOldNotSupported(c *check.C) { - v := strings.Split(string(api.MinVersion), ".") + v := strings.Split(api.MinVersion.String(), ".") vMinInt, err := strconv.Atoi(v[1]) c.Assert(err, checker.IsNil) vMinInt--