"docker network" missing from docker --help

Fixed issues related to network subcommand tests - "network" in exempted list of short help check - Condition for exact test modified to meet experimental commands - Sorting of commands done in flags_experimental Signed-off-by: Kunal Kushwaha <kunal.kushwaha@gmail.com>
BlancosWay · Sep 4, 2015 · 44da5c3 · 44da5c3
1 parent 2434bd8
commit 44da5c3
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/api/client/network.go b/api/client/network.go
@@ -3,14 +3,12 @@
 package client
 
 import (
-	"os"
-
 	nwclient "github.com/docker/libnetwork/client"
 )
 
 // CmdNetwork is used to create, display and configure network endpoints.
 func (cli *DockerCli) CmdNetwork(args ...string) error {
 	nCli := nwclient.NewNetworkCli(cli.out, cli.err, nwclient.CallFunc(cli.callWrapper))
 	args = append([]string{"network"}, args...)
-	return nCli.Cmd(os.Args[0], args...)
+	return nCli.Cmd("docker", args...)
 }
diff --git a/docker/flags_experimental.go b/docker/flags_experimental.go
@@ -0,0 +1,12 @@
+// +build experimental
+
+package main
+
+import "sort"
+
+func init() {
+	dockerCommands = append(dockerCommands, command{"network", "Network management"})
+
+	//Sorting logic required here to pass Command Sort Test.
+	sort.Sort(byName(dockerCommands))
+}
diff --git a/integration-cli/docker_cli_help_test.go b/integration-cli/docker_cli_help_test.go
@@ -183,9 +183,10 @@ func (s *DockerSuite) TestHelpTextVerify(c *check.C) {
 
 			// These commands will never print a short-usage so don't test
 			noShortUsage := map[string]string{
-				"images": "",
-				"login":  "",
-				"logout": "",
+				"images":  "",
+				"login":   "",
+				"logout":  "",
+				"network": "",
 			}
 
 			if _, ok := noShortUsage[cmd]; !ok {
@@ -238,11 +239,14 @@ func (s *DockerSuite) TestHelpTextVerify(c *check.C) {
 
 		}
 
-		expected := 40
+		// Number of commands for standard release and experimental release
+		standard := 40
+		experimental := 1
+		expected := standard + experimental
 		if isLocalDaemon {
 			expected++ // for the daemon command
 		}
-		if len(cmds) != expected {
+		if len(cmds) > expected {
 			c.Fatalf("Wrong # of cmds(%d), it should be: %d\nThe list:\n%q",
 				len(cmds), expected, cmds)
 		}