starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-24 15:30:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31557 from ripcurld0/add_stack_ls

Browse Source 
Add the format option to the docker stack ls command
Upstream-commit: 6559abaf477352dc03725a70c85d0ea9c8d5974e
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2017-04-26 19:13:33 -07:00
committed by GitHub
parent 1f57e06852 76d9eb02b7
commit e7900cc574
5 changed files with 191 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_stack_test.go
+15 -4
View File
@@ -15,6 +15,17 @@ import (
"github.com/go-check/check"
)
var cleanSpaces = func(s string) string {
lines := strings.Split(s, "\n")
for i, line := range lines {
spaceIx := strings.Index(line, " ")
if spaceIx > 0 {
lines[i] = line[:spaceIx+1] + strings.TrimLeft(line[spaceIx:], " ")
}
}
return strings.Join(lines, "\n")
}
func (s *DockerSwarmSuite) TestStackRemoveUnknown(c *check.C) {
d := s.AddDaemon(c, true, true)
@@ -59,13 +70,13 @@ func (s *DockerSwarmSuite) TestStackDeployComposeFile(c *check.C) {
out, err = d.Cmd("stack", "ls")
c.Assert(err, checker.IsNil)
c.Assert(out, check.Equals, "NAME SERVICES\n"+"testdeploy 2\n")
c.Assert(cleanSpaces(out), check.Equals, "NAME SERVICES\n"+"testdeploy 2\n")
out, err = d.Cmd("stack", "rm", testStackName)
c.Assert(err, checker.IsNil)
out, err = d.Cmd("stack", "ls")
c.Assert(err, checker.IsNil)
c.Assert(out, check.Equals, "NAME SERVICES\n")
c.Assert(cleanSpaces(out), check.Equals, "NAME SERVICES\n")
}
func (s *DockerSwarmSuite) TestStackDeployWithSecretsTwice(c *check.C) {
@@ -180,7 +191,7 @@ func (s *DockerSwarmSuite) TestStackDeployWithDAB(c *check.C) {
stackArgs = []string{"stack", "ls"}
out, err = d.Cmd(stackArgs...)
c.Assert(err, checker.IsNil)
c.Assert(out, check.Equals, "NAME SERVICES\n"+"test 2\n")
c.Assert(cleanSpaces(out), check.Equals, "NAME SERVICES\n"+"test 2\n")
// rm
stackArgs = []string{"stack", "rm", testStackName}
out, err = d.Cmd(stackArgs...)
@@ -191,5 +202,5 @@ func (s *DockerSwarmSuite) TestStackDeployWithDAB(c *check.C) {
stackArgs = []string{"stack", "ls"}
out, err = d.Cmd(stackArgs...)
c.Assert(err, checker.IsNil)
c.Assert(out, check.Equals, "NAME SERVICES\n")
c.Assert(cleanSpaces(out), check.Equals, "NAME SERVICES\n")
}