Merge pull request #13386 from icecrime/experimental_suffix_version

Suffix experimental version / fix warning output

integration-cli/docker_cli_experimental_test.go

@@ -0,0 +1,24 @@
+// +build experimental
+
+package main
+
+import (
+	"os/exec"
+	"strings"
+
+	"github.com/go-check/check"
+)
+
+func (s *DockerSuite) TestExperimentalVersion(c *check.C) {
+	versionCmd := exec.Command(dockerBinary, "version")
+	out, _, err := runCommandWithOutput(versionCmd)
+	if err != nil {
+		c.Fatalf("failed to execute docker version: %s, %v", out, err)
+	}
+
+	for _, line := range strings.Split(out, "\n") {
+		if strings.HasPrefix(line, "Client version:") || strings.HasPrefix(line, "Server version:") {
+			c.Assert(line, check.Matches, "*-experimental")
+		}
+	}
+}

integration-cli/docker_cli_info_test.go

@@ -4,6 +4,7 @@ import (
 	"os/exec"
 	"strings"
 
+	"github.com/docker/docker/utils"
 	"github.com/go-check/check"
 )
 
@@ -26,12 +27,16 @@ func (s *DockerSuite) TestInfoEnsureSucceeds(c *check.C) {
 		"CPUs:",
 		"Total Memory:",
 		"Kernel Version:",
-		"Storage Driver:"}
+		"Storage Driver:",
+	}
+
+	if utils.ExperimentalBuild() {
+		stringsToCheck = append(stringsToCheck, "Experimental: true")
+	}
 
 	for _, linePrefix := range stringsToCheck {
 		if !strings.Contains(out, linePrefix) {
 			c.Errorf("couldn't find string %v in output", linePrefix)
 		}
 	}
-
 }