From 24cd5444f982fd295248006f44c6ec2f4ab7f1f8 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Tue, 17 Jan 2017 10:54:22 -0800 Subject: [PATCH] Switch TestSwarmPublishDuplicatePorts to different ports There is an issue with the ports leaking to other tests. This is a workaround until the actual problem is addressed. Signed-off-by: Tonis Tiigi --- integration-cli/docker_cli_swarm_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-cli/docker_cli_swarm_test.go b/integration-cli/docker_cli_swarm_test.go index 61e5fc3f45..b68b5e0822 100644 --- a/integration-cli/docker_cli_swarm_test.go +++ b/integration-cli/docker_cli_swarm_test.go @@ -1576,7 +1576,7 @@ func (s *DockerSwarmSuite) TestSwarmServicePsMultipleServiceIDs(c *check.C) { func (s *DockerSwarmSuite) TestSwarmPublishDuplicatePorts(c *check.C) { d := s.AddDaemon(c, true, true) - out, err := d.Cmd("service", "create", "--publish", "5000:80", "--publish", "5001:80", "--publish", "80", "--publish", "80", "busybox", "top") + out, err := d.Cmd("service", "create", "--publish", "5005:80", "--publish", "5006:80", "--publish", "80", "--publish", "80", "busybox", "top") c.Assert(err, check.IsNil, check.Commentf(out)) id := strings.TrimSpace(out) @@ -1588,8 +1588,8 @@ func (s *DockerSwarmSuite) TestSwarmPublishDuplicatePorts(c *check.C) { out, err = d.Cmd("service", "inspect", "--format", "{{.Endpoint.Ports}} len={{len .Endpoint.Ports}}", id) c.Assert(err, check.IsNil, check.Commentf(out)) c.Assert(out, checker.Contains, "len=4") - c.Assert(out, checker.Contains, "{ tcp 80 5000 ingress}") - c.Assert(out, checker.Contains, "{ tcp 80 5001 ingress}") + c.Assert(out, checker.Contains, "{ tcp 80 5005 ingress}") + c.Assert(out, checker.Contains, "{ tcp 80 5006 ingress}") } func (s *DockerSwarmSuite) TestSwarmJoinWithDrain(c *check.C) {