Signed-off-by: Dong Chen <dongluo.chen@docker.com>
(cherry picked from commit e42d1bb4b229b825a388490f24885f06a7afc401)
Signed-off-by: Victor Vieux <vieux@docker.com>
| ... | ... |
@@ -344,29 +344,23 @@ func (s *DockerSwarmSuite) TestSwarmContainerAttachByNetworkId(c *check.C) {
|
| 344 | 344 |
} |
| 345 | 345 |
|
| 346 | 346 |
func (s *DockerSwarmSuite) TestOverlayAttachable(c *check.C) {
|
| 347 |
- d1 := s.AddDaemon(c, true, true) |
|
| 348 |
- d2 := s.AddDaemon(c, true, false) |
|
| 347 |
+ d := s.AddDaemon(c, true, true) |
|
| 349 | 348 |
|
| 350 |
- out, err := d1.Cmd("network", "create", "-d", "overlay", "--attachable", "ovnet")
|
|
| 349 |
+ out, err := d.Cmd("network", "create", "-d", "overlay", "--attachable", "ovnet")
|
|
| 351 | 350 |
c.Assert(err, checker.IsNil, check.Commentf(out)) |
| 352 | 351 |
|
| 353 | 352 |
// validate attachable |
| 354 |
- out, err = d1.Cmd("network", "inspect", "--format", "{{json .Attachable}}", "ovnet")
|
|
| 353 |
+ out, err = d.Cmd("network", "inspect", "--format", "{{json .Attachable}}", "ovnet")
|
|
| 355 | 354 |
c.Assert(err, checker.IsNil, check.Commentf(out)) |
| 356 | 355 |
c.Assert(strings.TrimSpace(out), checker.Equals, "true") |
| 357 | 356 |
|
| 358 | 357 |
// validate containers can attache to this overlay network |
| 359 |
- out, err = d1.Cmd("run", "-d", "--network", "ovnet", "--name", "c1", "busybox", "top")
|
|
| 360 |
- c.Assert(err, checker.IsNil, check.Commentf(out)) |
|
| 361 |
- out, err = d2.Cmd("run", "-d", "--network", "ovnet", "--name", "c2", "busybox", "top")
|
|
| 358 |
+ out, err = d.Cmd("run", "-d", "--network", "ovnet", "--name", "c1", "busybox", "top")
|
|
| 362 | 359 |
c.Assert(err, checker.IsNil, check.Commentf(out)) |
| 363 | 360 |
|
| 364 | 361 |
// redo validation, there was a bug that the value of attachable changes after |
| 365 | 362 |
// containers attach to the network |
| 366 |
- out, err = d1.Cmd("network", "inspect", "--format", "{{json .Attachable}}", "ovnet")
|
|
| 367 |
- c.Assert(err, checker.IsNil, check.Commentf(out)) |
|
| 368 |
- c.Assert(strings.TrimSpace(out), checker.Equals, "true") |
|
| 369 |
- out, err = d2.Cmd("network", "inspect", "--format", "{{json .Attachable}}", "ovnet")
|
|
| 363 |
+ out, err = d.Cmd("network", "inspect", "--format", "{{json .Attachable}}", "ovnet")
|
|
| 370 | 364 |
c.Assert(err, checker.IsNil, check.Commentf(out)) |
| 371 | 365 |
c.Assert(strings.TrimSpace(out), checker.Equals, "true") |
| 372 | 366 |
} |