Browse code

pkg/version.Version: use the new String() method

Resolves #18750

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>

Aditi Rajagopal authored on 2015/12/19 05:28:17
Showing 2 changed files
... ...
@@ -104,7 +104,7 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, clientFlags *cli.ClientF
104 104
 		}
105 105
 		customHeaders["User-Agent"] = "Docker-Client/" + dockerversion.Version + " (" + runtime.GOOS + ")"
106 106
 
107
-		verStr := string(api.DefaultVersion)
107
+		verStr := api.DefaultVersion.String()
108 108
 		if tmpStr := os.Getenv("DOCKER_API_VERSION"); tmpStr != "" {
109 109
 			verStr = tmpStr
110 110
 		}
... ...
@@ -49,7 +49,7 @@ func (s *DockerSuite) TestApiVersionStatusCode(c *check.C) {
49 49
 }
50 50
 
51 51
 func (s *DockerSuite) TestApiClientVersionNewerThanServer(c *check.C) {
52
-	v := strings.Split(string(api.DefaultVersion), ".")
52
+	v := strings.Split(api.DefaultVersion.String(), ".")
53 53
 	vMinInt, err := strconv.Atoi(v[1])
54 54
 	c.Assert(err, checker.IsNil)
55 55
 	vMinInt++
... ...
@@ -63,7 +63,7 @@ func (s *DockerSuite) TestApiClientVersionNewerThanServer(c *check.C) {
63 63
 }
64 64
 
65 65
 func (s *DockerSuite) TestApiClientVersionOldNotSupported(c *check.C) {
66
-	v := strings.Split(string(api.MinVersion), ".")
66
+	v := strings.Split(api.MinVersion.String(), ".")
67 67
 	vMinInt, err := strconv.Atoi(v[1])
68 68
 	c.Assert(err, checker.IsNil)
69 69
 	vMinInt--