0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #40949 from thaJeztah/fix_TestSwarmManagerAddress_on_other_cli

Browse source 
Fix TestSwarmManagerAddress to not depend on "pretty" format
This commit is contained in:
Tibor Vass 2020-05-14 22:18:44 -07:00 • committed by GitHub
commit 1e315b42e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
integration-cli/docker_cli_swarm_test.go
View file

@ -1454,17 +1454,17 @@ func (s *DockerSwarmSuite) TestSwarmManagerAddress(c *testing.T) {
d3 := s.AddDaemon(c, true, false)
// Manager Addresses will always show Node 1's address
expectedOutput := fmt.Sprintf("Manager Addresses:\n 127.0.0.1:%d\n", d1.SwarmPort)
expectedOutput := fmt.Sprintf("127.0.0.1:%d", d1.SwarmPort)
out, err := d1.Cmd("info")
out, err := d1.Cmd("info", "--format", "{{ (index .Swarm.RemoteManagers 0).Addr }}")
assert.NilError(c, err, out)
assert.Assert(c, strings.Contains(out, expectedOutput), out)
out, err = d2.Cmd("info")
out, err = d2.Cmd("info", "--format", "{{ (index .Swarm.RemoteManagers 0).Addr }}")
assert.NilError(c, err, out)
assert.Assert(c, strings.Contains(out, expectedOutput), out)
out, err = d3.Cmd("info")
out, err = d3.Cmd("info", "--format", "{{ (index .Swarm.RemoteManagers 0).Addr }}")
assert.NilError(c, err, out)
assert.Assert(c, strings.Contains(out, expectedOutput), out)
}