Fix TestSwarmManagerAddress to not depend on "pretty" format

This allows this test to be run on other versions of the CLI

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2020-05-11 14:07:04 +02:00
parent 298ba5b131
commit 9871b6e30e
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 4 additions and 4 deletions

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)
}