From 5acbd9b2126ad7f2204425327abc93cbaa60d409 Mon Sep 17 00:00:00 2001 From: Dong Chen Date: Tue, 29 Nov 2016 14:05:12 -0800 Subject: [PATCH] Run overlay attachable test on a single daemon Signed-off-by: Dong Chen Upstream-commit: e42d1bb4b229b825a388490f24885f06a7afc401 Component: engine --- .../integration-cli/docker_cli_swarm_test.go | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_swarm_test.go b/components/engine/integration-cli/docker_cli_swarm_test.go index fc343a1c17..e3bf059a51 100644 --- a/components/engine/integration-cli/docker_cli_swarm_test.go +++ b/components/engine/integration-cli/docker_cli_swarm_test.go @@ -426,29 +426,23 @@ func (s *DockerSwarmSuite) TestSwarmContainerAttachByNetworkId(c *check.C) { } func (s *DockerSwarmSuite) TestOverlayAttachable(c *check.C) { - d1 := s.AddDaemon(c, true, true) - d2 := s.AddDaemon(c, true, false) + d := s.AddDaemon(c, true, true) - out, err := d1.Cmd("network", "create", "-d", "overlay", "--attachable", "ovnet") + out, err := d.Cmd("network", "create", "-d", "overlay", "--attachable", "ovnet") c.Assert(err, checker.IsNil, check.Commentf(out)) // validate attachable - out, err = d1.Cmd("network", "inspect", "--format", "{{json .Attachable}}", "ovnet") + out, err = d.Cmd("network", "inspect", "--format", "{{json .Attachable}}", "ovnet") c.Assert(err, checker.IsNil, check.Commentf(out)) c.Assert(strings.TrimSpace(out), checker.Equals, "true") // validate containers can attache to this overlay network - out, err = d1.Cmd("run", "-d", "--network", "ovnet", "--name", "c1", "busybox", "top") - c.Assert(err, checker.IsNil, check.Commentf(out)) - out, err = d2.Cmd("run", "-d", "--network", "ovnet", "--name", "c2", "busybox", "top") + out, err = d.Cmd("run", "-d", "--network", "ovnet", "--name", "c1", "busybox", "top") c.Assert(err, checker.IsNil, check.Commentf(out)) // redo validation, there was a bug that the value of attachable changes after // containers attach to the network - out, err = d1.Cmd("network", "inspect", "--format", "{{json .Attachable}}", "ovnet") - c.Assert(err, checker.IsNil, check.Commentf(out)) - c.Assert(strings.TrimSpace(out), checker.Equals, "true") - out, err = d2.Cmd("network", "inspect", "--format", "{{json .Attachable}}", "ovnet") + out, err = d.Cmd("network", "inspect", "--format", "{{json .Attachable}}", "ovnet") c.Assert(err, checker.IsNil, check.Commentf(out)) c.Assert(strings.TrimSpace(out), checker.Equals, "true") }