Browse code
Remove testRequires(c, Network) from swarm integration tests
Since 24237 has been merged, it is not necessary to require network
for swarm integration tests (`integration-cli/docker_api_swarm_test.go`)
any more.
This fix removes testRequires(c, Network) from swarm integration
tests.
This fix could be verified by disable networking, and all related
tests pass.
This fix is related to 24547, 24490, 24237.
This fix fixes 24547.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Yong Tang authored on 2016/07/31 01:59:30Showing 1 changed files
| ... | ... |
@@ -21,7 +21,6 @@ import ( |
| 21 | 21 |
var defaultReconciliationTimeout = 30 * time.Second |
| 22 | 22 |
|
| 23 | 23 |
func (s *DockerSwarmSuite) TestApiSwarmInit(c *check.C) {
|
| 24 |
- testRequires(c, Network) |
|
| 25 | 24 |
// todo: should find a better way to verify that components are running than /info |
| 26 | 25 |
d1 := s.AddDaemon(c, true, true) |
| 27 | 26 |
info, err := d1.info() |
| ... | ... |
@@ -73,7 +72,6 @@ func (s *DockerSwarmSuite) TestApiSwarmInit(c *check.C) {
|
| 73 | 73 |
} |
| 74 | 74 |
|
| 75 | 75 |
func (s *DockerSwarmSuite) TestApiSwarmJoinToken(c *check.C) {
|
| 76 |
- testRequires(c, Network) |
|
| 77 | 76 |
d1 := s.AddDaemon(c, false, false) |
| 78 | 77 |
c.Assert(d1.Init(swarm.InitRequest{}), checker.IsNil)
|
| 79 | 78 |
|
| ... | ... |
@@ -145,7 +143,6 @@ func (s *DockerSwarmSuite) TestApiSwarmJoinToken(c *check.C) {
|
| 145 | 145 |
} |
| 146 | 146 |
|
| 147 | 147 |
func (s *DockerSwarmSuite) TestApiSwarmCAHash(c *check.C) {
|
| 148 |
- testRequires(c, Network) |
|
| 149 | 148 |
d1 := s.AddDaemon(c, true, true) |
| 150 | 149 |
d2 := s.AddDaemon(c, false, false) |
| 151 | 150 |
splitToken := strings.Split(d1.joinTokens(c).Worker, "-") |
| ... | ... |
@@ -157,7 +154,6 @@ func (s *DockerSwarmSuite) TestApiSwarmCAHash(c *check.C) {
|
| 157 | 157 |
} |
| 158 | 158 |
|
| 159 | 159 |
func (s *DockerSwarmSuite) TestApiSwarmPromoteDemote(c *check.C) {
|
| 160 |
- testRequires(c, Network) |
|
| 161 | 160 |
d1 := s.AddDaemon(c, false, false) |
| 162 | 161 |
c.Assert(d1.Init(swarm.InitRequest{}), checker.IsNil)
|
| 163 | 162 |
d2 := s.AddDaemon(c, true, false) |
| ... | ... |
@@ -201,7 +197,6 @@ func (s *DockerSwarmSuite) TestApiSwarmPromoteDemote(c *check.C) {
|
| 201 | 201 |
} |
| 202 | 202 |
|
| 203 | 203 |
func (s *DockerSwarmSuite) TestApiSwarmServicesEmptyList(c *check.C) {
|
| 204 |
- testRequires(c, Network) |
|
| 205 | 204 |
d := s.AddDaemon(c, true, true) |
| 206 | 205 |
|
| 207 | 206 |
services := d.listServices(c) |
| ... | ... |
@@ -210,7 +205,6 @@ func (s *DockerSwarmSuite) TestApiSwarmServicesEmptyList(c *check.C) {
|
| 210 | 210 |
} |
| 211 | 211 |
|
| 212 | 212 |
func (s *DockerSwarmSuite) TestApiSwarmServicesCreate(c *check.C) {
|
| 213 |
- testRequires(c, Network) |
|
| 214 | 213 |
d := s.AddDaemon(c, true, true) |
| 215 | 214 |
|
| 216 | 215 |
instances := 2 |
| ... | ... |
@@ -227,7 +221,6 @@ func (s *DockerSwarmSuite) TestApiSwarmServicesCreate(c *check.C) {
|
| 227 | 227 |
} |
| 228 | 228 |
|
| 229 | 229 |
func (s *DockerSwarmSuite) TestApiSwarmServicesMultipleAgents(c *check.C) {
|
| 230 |
- testRequires(c, Network) |
|
| 231 | 230 |
d1 := s.AddDaemon(c, true, true) |
| 232 | 231 |
d2 := s.AddDaemon(c, true, false) |
| 233 | 232 |
d3 := s.AddDaemon(c, true, false) |
| ... | ... |
@@ -256,7 +249,6 @@ func (s *DockerSwarmSuite) TestApiSwarmServicesMultipleAgents(c *check.C) {
|
| 256 | 256 |
} |
| 257 | 257 |
|
| 258 | 258 |
func (s *DockerSwarmSuite) TestApiSwarmServicesCreateGlobal(c *check.C) {
|
| 259 |
- testRequires(c, Network) |
|
| 260 | 259 |
d1 := s.AddDaemon(c, true, true) |
| 261 | 260 |
d2 := s.AddDaemon(c, true, false) |
| 262 | 261 |
d3 := s.AddDaemon(c, true, false) |
| ... | ... |
@@ -321,7 +313,6 @@ func (s *DockerSwarmSuite) TestApiSwarmServicesUpdate(c *check.C) {
|
| 321 | 321 |
} |
| 322 | 322 |
|
| 323 | 323 |
func (s *DockerSwarmSuite) TestApiSwarmServicesStateReporting(c *check.C) {
|
| 324 |
- testRequires(c, Network) |
|
| 325 | 324 |
testRequires(c, SameHostDaemon) |
| 326 | 325 |
testRequires(c, DaemonIsLinux) |
| 327 | 326 |
|
| ... | ... |
@@ -484,7 +475,6 @@ func (s *DockerSwarmSuite) TestApiSwarmLeaderElection(c *check.C) {
|
| 484 | 484 |
} |
| 485 | 485 |
|
| 486 | 486 |
func (s *DockerSwarmSuite) TestApiSwarmRaftQuorum(c *check.C) {
|
| 487 |
- testRequires(c, Network) |
|
| 488 | 487 |
d1 := s.AddDaemon(c, true, true) |
| 489 | 488 |
d2 := s.AddDaemon(c, true, true) |
| 490 | 489 |
d3 := s.AddDaemon(c, true, true) |
| ... | ... |
@@ -523,7 +513,6 @@ func (s *DockerSwarmSuite) TestApiSwarmRaftQuorum(c *check.C) {
|
| 523 | 523 |
} |
| 524 | 524 |
|
| 525 | 525 |
func (s *DockerSwarmSuite) TestApiSwarmListNodes(c *check.C) {
|
| 526 |
- testRequires(c, Network) |
|
| 527 | 526 |
d1 := s.AddDaemon(c, true, true) |
| 528 | 527 |
d2 := s.AddDaemon(c, true, false) |
| 529 | 528 |
d3 := s.AddDaemon(c, true, false) |
| ... | ... |
@@ -543,7 +532,6 @@ loop0: |
| 543 | 543 |
} |
| 544 | 544 |
|
| 545 | 545 |
func (s *DockerSwarmSuite) TestApiSwarmNodeUpdate(c *check.C) {
|
| 546 |
- testRequires(c, Network) |
|
| 547 | 546 |
d := s.AddDaemon(c, true, true) |
| 548 | 547 |
|
| 549 | 548 |
nodes := d.listNodes(c) |
| ... | ... |
@@ -557,7 +545,6 @@ func (s *DockerSwarmSuite) TestApiSwarmNodeUpdate(c *check.C) {
|
| 557 | 557 |
} |
| 558 | 558 |
|
| 559 | 559 |
func (s *DockerSwarmSuite) TestApiSwarmNodeDrainPause(c *check.C) {
|
| 560 |
- testRequires(c, Network) |
|
| 561 | 560 |
d1 := s.AddDaemon(c, true, true) |
| 562 | 561 |
d2 := s.AddDaemon(c, true, false) |
| 563 | 562 |
|
| ... | ... |
@@ -612,7 +599,6 @@ func (s *DockerSwarmSuite) TestApiSwarmNodeDrainPause(c *check.C) {
|
| 612 | 612 |
} |
| 613 | 613 |
|
| 614 | 614 |
func (s *DockerSwarmSuite) TestApiSwarmLeaveRemovesContainer(c *check.C) {
|
| 615 |
- testRequires(c, Network) |
|
| 616 | 615 |
d := s.AddDaemon(c, true, true) |
| 617 | 616 |
|
| 618 | 617 |
instances := 2 |
| ... | ... |
@@ -674,7 +660,6 @@ func (s *DockerSwarmSuite) TestApiSwarmRestoreOnPendingJoin(c *check.C) {
|
| 674 | 674 |
} |
| 675 | 675 |
|
| 676 | 676 |
func (s *DockerSwarmSuite) TestApiSwarmManagerRestore(c *check.C) {
|
| 677 |
- testRequires(c, Network) |
|
| 678 | 677 |
d1 := s.AddDaemon(c, true, true) |
| 679 | 678 |
|
| 680 | 679 |
instances := 2 |
| ... | ... |
@@ -704,7 +689,6 @@ func (s *DockerSwarmSuite) TestApiSwarmManagerRestore(c *check.C) {
|
| 704 | 704 |
} |
| 705 | 705 |
|
| 706 | 706 |
func (s *DockerSwarmSuite) TestApiSwarmScaleNoRollingUpdate(c *check.C) {
|
| 707 |
- testRequires(c, Network) |
|
| 708 | 707 |
d := s.AddDaemon(c, true, true) |
| 709 | 708 |
|
| 710 | 709 |
instances := 2 |