Browse code
upper case docker info details
Signed-off-by: allencloud <allen.sun@daocloud.io>
allencloud authored on 2016/03/28 16:46:53Showing 3 changed files
- api/client/info.go
- integration-cli/docker_cli_daemon_test.go
- integration-cli/docker_cli_info_test.go
| ... | ... |
@@ -77,8 +77,8 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
|
| 77 | 77 |
ioutils.FprintfIfNotEmpty(cli.out, "Name: %s\n", info.Name) |
| 78 | 78 |
ioutils.FprintfIfNotEmpty(cli.out, "ID: %s\n", info.ID) |
| 79 | 79 |
fmt.Fprintf(cli.out, "Docker Root Dir: %s\n", info.DockerRootDir) |
| 80 |
- fmt.Fprintf(cli.out, "Debug mode (client): %v\n", utils.IsDebugEnabled()) |
|
| 81 |
- fmt.Fprintf(cli.out, "Debug mode (server): %v\n", info.Debug) |
|
| 80 |
+ fmt.Fprintf(cli.out, "Debug Mode (client): %v\n", utils.IsDebugEnabled()) |
|
| 81 |
+ fmt.Fprintf(cli.out, "Debug Mode (server): %v\n", info.Debug) |
|
| 82 | 82 |
|
| 83 | 83 |
if info.Debug {
|
| 84 | 84 |
fmt.Fprintf(cli.out, " File Descriptors: %d\n", info.NFd) |
| ... | ... |
@@ -145,11 +145,11 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
|
| 145 | 145 |
|
| 146 | 146 |
ioutils.FprintfIfTrue(cli.out, "Experimental: %v\n", info.ExperimentalBuild) |
| 147 | 147 |
if info.ClusterStore != "" {
|
| 148 |
- fmt.Fprintf(cli.out, "Cluster store: %s\n", info.ClusterStore) |
|
| 148 |
+ fmt.Fprintf(cli.out, "Cluster Store: %s\n", info.ClusterStore) |
|
| 149 | 149 |
} |
| 150 | 150 |
|
| 151 | 151 |
if info.ClusterAdvertise != "" {
|
| 152 |
- fmt.Fprintf(cli.out, "Cluster advertise: %s\n", info.ClusterAdvertise) |
|
| 152 |
+ fmt.Fprintf(cli.out, "Cluster Advertise: %s\n", info.ClusterAdvertise) |
|
| 153 | 153 |
} |
| 154 | 154 |
return nil |
| 155 | 155 |
} |
| ... | ... |
@@ -2129,6 +2129,6 @@ func (s *DockerSuite) TestDaemonDiscoveryBackendConfigReload(c *check.C) {
|
| 2129 | 2129 |
|
| 2130 | 2130 |
out, err := d.Cmd("info")
|
| 2131 | 2131 |
c.Assert(err, checker.IsNil) |
| 2132 |
- c.Assert(out, checker.Contains, fmt.Sprintf("Cluster store: consul://consuladdr:consulport/some/path"))
|
|
| 2133 |
- c.Assert(out, checker.Contains, fmt.Sprintf("Cluster advertise: 192.168.56.100:0"))
|
|
| 2132 |
+ c.Assert(out, checker.Contains, fmt.Sprintf("Cluster Store: consul://consuladdr:consulport/some/path"))
|
|
| 2133 |
+ c.Assert(out, checker.Contains, fmt.Sprintf("Cluster Advertise: 192.168.56.100:0"))
|
|
| 2134 | 2134 |
} |
| ... | ... |
@@ -57,8 +57,8 @@ func (s *DockerSuite) TestInfoDiscoveryBackend(c *check.C) {
|
| 57 | 57 |
|
| 58 | 58 |
out, err := d.Cmd("info")
|
| 59 | 59 |
c.Assert(err, checker.IsNil) |
| 60 |
- c.Assert(out, checker.Contains, fmt.Sprintf("Cluster store: %s\n", discoveryBackend))
|
|
| 61 |
- c.Assert(out, checker.Contains, fmt.Sprintf("Cluster advertise: %s\n", discoveryAdvertise))
|
|
| 60 |
+ c.Assert(out, checker.Contains, fmt.Sprintf("Cluster Store: %s\n", discoveryBackend))
|
|
| 61 |
+ c.Assert(out, checker.Contains, fmt.Sprintf("Cluster Advertise: %s\n", discoveryAdvertise))
|
|
| 62 | 62 |
} |
| 63 | 63 |
|
| 64 | 64 |
// TestInfoDiscoveryInvalidAdvertise verifies that a daemon run with |
| ... | ... |
@@ -101,8 +101,8 @@ func (s *DockerSuite) TestInfoDiscoveryAdvertiseInterfaceName(c *check.C) {
|
| 101 | 101 |
|
| 102 | 102 |
out, err := d.Cmd("info")
|
| 103 | 103 |
c.Assert(err, checker.IsNil) |
| 104 |
- c.Assert(out, checker.Contains, fmt.Sprintf("Cluster store: %s\n", discoveryBackend))
|
|
| 105 |
- c.Assert(out, checker.Contains, fmt.Sprintf("Cluster advertise: %s:2375\n", ip.String()))
|
|
| 104 |
+ c.Assert(out, checker.Contains, fmt.Sprintf("Cluster Store: %s\n", discoveryBackend))
|
|
| 105 |
+ c.Assert(out, checker.Contains, fmt.Sprintf("Cluster Advertise: %s:2375\n", ip.String()))
|
|
| 106 | 106 |
} |
| 107 | 107 |
|
| 108 | 108 |
func (s *DockerSuite) TestInfoDisplaysRunningContainers(c *check.C) {
|
| ... | ... |
@@ -156,8 +156,8 @@ func (s *DockerSuite) TestInfoDebug(c *check.C) {
|
| 156 | 156 |
|
| 157 | 157 |
out, err := d.Cmd("--debug", "info")
|
| 158 | 158 |
c.Assert(err, checker.IsNil) |
| 159 |
- c.Assert(out, checker.Contains, "Debug mode (client): true\n") |
|
| 160 |
- c.Assert(out, checker.Contains, "Debug mode (server): true\n") |
|
| 159 |
+ c.Assert(out, checker.Contains, "Debug Mode (client): true\n") |
|
| 160 |
+ c.Assert(out, checker.Contains, "Debug Mode (server): true\n") |
|
| 161 | 161 |
c.Assert(out, checker.Contains, "File Descriptors") |
| 162 | 162 |
c.Assert(out, checker.Contains, "Goroutines") |
| 163 | 163 |
c.Assert(out, checker.Contains, "System Time") |