Procházet zdrojové kódy

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

Resolves #18750

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
Aditi Rajagopal před 9 roky
rodič
revize
278e75800c
2 změnil soubory, kde provedl 3 přidání a 3 odebrání
  1. 1 1
      api/client/cli.go
  2. 2 2
      integration-cli/docker_api_test.go

+ 1 - 1
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
 		}

+ 2 - 2
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--