Browse code
integration-cli: fix --net=none tests
Example:
21:28:01 [d68573521] waiting for daemon to start
21:28:01 [d68573521] daemon started
21:28:01 docker_api_swarm_test.go:163:
21:28:01 c.Assert(d1.Init(map[string]bool{"worker": true}, ""),
checker.IsNil)
21:28:01 ... value *errors.errorString =
&errors.errorString{s:"initializing swarm: invalid statuscode 500,
\"{\\\"message\\\":\\\"could not determine local IP address: dial udp
8.8.8.8:53: connect: network is unreachable\\\"}\\n\"} ("initializing
swarm: invalid statuscode 500, \"{\\\"message\\\":\\\"could not
determine local IP address: dial udp 8.8.8.8:53: connect: network is
unreachable\\\"}\\n\"")
21:28:01
21:28:01 [d68573521] exiting daemon"}
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit 9fadb8fd6a09c8982dc8a44125f4d21c33c8c394)
Signed-off-by: Tibor Vass <tibor@docker.com>
Antonio Murdaca authored on 2016/07/10 22:54:52Showing 1 changed files
| ... | ... |
@@ -18,6 +18,7 @@ import ( |
| 18 | 18 |
var defaultReconciliationTimeout = 30 * time.Second |
| 19 | 19 |
|
| 20 | 20 |
func (s *DockerSwarmSuite) TestApiSwarmInit(c *check.C) {
|
| 21 |
+ testRequires(c, Network) |
|
| 21 | 22 |
// todo: should find a better way to verify that components are running than /info |
| 22 | 23 |
d1 := s.AddDaemon(c, true, true) |
| 23 | 24 |
info, err := d1.info() |
| ... | ... |
@@ -69,9 +70,11 @@ func (s *DockerSwarmSuite) TestApiSwarmInit(c *check.C) {
|
| 69 | 69 |
} |
| 70 | 70 |
|
| 71 | 71 |
func (s *DockerSwarmSuite) TestApiSwarmManualAcceptance(c *check.C) {
|
| 72 |
+ testRequires(c, Network) |
|
| 72 | 73 |
s.testAPISwarmManualAcceptance(c, "") |
| 73 | 74 |
} |
| 74 | 75 |
func (s *DockerSwarmSuite) TestApiSwarmManualAcceptanceSecret(c *check.C) {
|
| 76 |
+ testRequires(c, Network) |
|
| 75 | 77 |
s.testAPISwarmManualAcceptance(c, "foobaz") |
| 76 | 78 |
} |
| 77 | 79 |
|
| ... | ... |
@@ -129,6 +132,7 @@ func (s *DockerSwarmSuite) testAPISwarmManualAcceptance(c *check.C, secret strin |
| 129 | 129 |
} |
| 130 | 130 |
|
| 131 | 131 |
func (s *DockerSwarmSuite) TestApiSwarmSecretAcceptance(c *check.C) {
|
| 132 |
+ testRequires(c, Network) |
|
| 132 | 133 |
d1 := s.AddDaemon(c, false, false) |
| 133 | 134 |
secret := "foobar" |
| 134 | 135 |
c.Assert(d1.Init(swarm.InitRequest{
|
| ... | ... |
@@ -236,6 +240,7 @@ func (s *DockerSwarmSuite) TestApiSwarmSecretAcceptance(c *check.C) {
|
| 236 | 236 |
} |
| 237 | 237 |
|
| 238 | 238 |
func (s *DockerSwarmSuite) TestApiSwarmCAHash(c *check.C) {
|
| 239 |
+ testRequires(c, Network) |
|
| 239 | 240 |
d1 := s.AddDaemon(c, true, true) |
| 240 | 241 |
d2 := s.AddDaemon(c, false, false) |
| 241 | 242 |
err := d2.Join(swarm.JoinRequest{CACertHash: "foobar", RemoteAddrs: []string{d1.listenAddr}})
|
| ... | ... |
@@ -247,6 +252,7 @@ func (s *DockerSwarmSuite) TestApiSwarmCAHash(c *check.C) {
|
| 247 | 247 |
} |
| 248 | 248 |
|
| 249 | 249 |
func (s *DockerSwarmSuite) TestApiSwarmPromoteDemote(c *check.C) {
|
| 250 |
+ testRequires(c, Network) |
|
| 250 | 251 |
d1 := s.AddDaemon(c, false, false) |
| 251 | 252 |
c.Assert(d1.Init(swarm.InitRequest{
|
| 252 | 253 |
Spec: swarm.Spec{
|
| ... | ... |
@@ -332,6 +338,7 @@ func (s *DockerSwarmSuite) TestApiSwarmPromoteDemote(c *check.C) {
|
| 332 | 332 |
} |
| 333 | 333 |
|
| 334 | 334 |
func (s *DockerSwarmSuite) TestApiSwarmServicesCreate(c *check.C) {
|
| 335 |
+ testRequires(c, Network) |
|
| 335 | 336 |
d := s.AddDaemon(c, true, true) |
| 336 | 337 |
|
| 337 | 338 |
instances := 2 |
| ... | ... |
@@ -348,6 +355,7 @@ func (s *DockerSwarmSuite) TestApiSwarmServicesCreate(c *check.C) {
|
| 348 | 348 |
} |
| 349 | 349 |
|
| 350 | 350 |
func (s *DockerSwarmSuite) TestApiSwarmServicesMultipleAgents(c *check.C) {
|
| 351 |
+ testRequires(c, Network) |
|
| 351 | 352 |
d1 := s.AddDaemon(c, true, true) |
| 352 | 353 |
d2 := s.AddDaemon(c, true, false) |
| 353 | 354 |
d3 := s.AddDaemon(c, true, false) |
| ... | ... |
@@ -376,6 +384,7 @@ func (s *DockerSwarmSuite) TestApiSwarmServicesMultipleAgents(c *check.C) {
|
| 376 | 376 |
} |
| 377 | 377 |
|
| 378 | 378 |
func (s *DockerSwarmSuite) TestApiSwarmServicesCreateGlobal(c *check.C) {
|
| 379 |
+ testRequires(c, Network) |
|
| 379 | 380 |
d1 := s.AddDaemon(c, true, true) |
| 380 | 381 |
d2 := s.AddDaemon(c, true, false) |
| 381 | 382 |
d3 := s.AddDaemon(c, true, false) |
| ... | ... |
@@ -394,6 +403,7 @@ func (s *DockerSwarmSuite) TestApiSwarmServicesCreateGlobal(c *check.C) {
|
| 394 | 394 |
} |
| 395 | 395 |
|
| 396 | 396 |
func (s *DockerSwarmSuite) TestApiSwarmServicesStateReporting(c *check.C) {
|
| 397 |
+ testRequires(c, Network) |
|
| 397 | 398 |
testRequires(c, SameHostDaemon) |
| 398 | 399 |
testRequires(c, DaemonIsLinux) |
| 399 | 400 |
|
| ... | ... |
@@ -468,6 +478,7 @@ func (s *DockerSwarmSuite) TestApiSwarmServicesStateReporting(c *check.C) {
|
| 468 | 468 |
} |
| 469 | 469 |
|
| 470 | 470 |
func (s *DockerSwarmSuite) TestApiSwarmRaftQuorum(c *check.C) {
|
| 471 |
+ testRequires(c, Network) |
|
| 471 | 472 |
d1 := s.AddDaemon(c, true, true) |
| 472 | 473 |
d2 := s.AddDaemon(c, true, true) |
| 473 | 474 |
d3 := s.AddDaemon(c, true, true) |
| ... | ... |
@@ -497,6 +508,7 @@ func (s *DockerSwarmSuite) TestApiSwarmRaftQuorum(c *check.C) {
|
| 497 | 497 |
} |
| 498 | 498 |
|
| 499 | 499 |
func (s *DockerSwarmSuite) TestApiSwarmListNodes(c *check.C) {
|
| 500 |
+ testRequires(c, Network) |
|
| 500 | 501 |
d1 := s.AddDaemon(c, true, true) |
| 501 | 502 |
d2 := s.AddDaemon(c, true, false) |
| 502 | 503 |
d3 := s.AddDaemon(c, true, false) |
| ... | ... |
@@ -516,6 +528,7 @@ loop0: |
| 516 | 516 |
} |
| 517 | 517 |
|
| 518 | 518 |
func (s *DockerSwarmSuite) TestApiSwarmNodeUpdate(c *check.C) {
|
| 519 |
+ testRequires(c, Network) |
|
| 519 | 520 |
d := s.AddDaemon(c, true, true) |
| 520 | 521 |
|
| 521 | 522 |
nodes := d.listNodes(c) |
| ... | ... |
@@ -529,6 +542,7 @@ func (s *DockerSwarmSuite) TestApiSwarmNodeUpdate(c *check.C) {
|
| 529 | 529 |
} |
| 530 | 530 |
|
| 531 | 531 |
func (s *DockerSwarmSuite) TestApiSwarmNodeDrainPause(c *check.C) {
|
| 532 |
+ testRequires(c, Network) |
|
| 532 | 533 |
d1 := s.AddDaemon(c, true, true) |
| 533 | 534 |
d2 := s.AddDaemon(c, true, false) |
| 534 | 535 |
|
| ... | ... |
@@ -583,6 +597,7 @@ func (s *DockerSwarmSuite) TestApiSwarmNodeDrainPause(c *check.C) {
|
| 583 | 583 |
} |
| 584 | 584 |
|
| 585 | 585 |
func (s *DockerSwarmSuite) TestApiSwarmLeaveRemovesContainer(c *check.C) {
|
| 586 |
+ testRequires(c, Network) |
|
| 586 | 587 |
d := s.AddDaemon(c, true, true) |
| 587 | 588 |
|
| 588 | 589 |
instances := 2 |
| ... | ... |
@@ -666,6 +681,7 @@ func (s *DockerSwarmSuite) TestApiSwarmRestoreOnPendingJoin(c *check.C) {
|
| 666 | 666 |
} |
| 667 | 667 |
|
| 668 | 668 |
func (s *DockerSwarmSuite) TestApiSwarmManagerRestore(c *check.C) {
|
| 669 |
+ testRequires(c, Network) |
|
| 669 | 670 |
d1 := s.AddDaemon(c, true, true) |
| 670 | 671 |
|
| 671 | 672 |
instances := 2 |
| ... | ... |
@@ -695,6 +711,7 @@ func (s *DockerSwarmSuite) TestApiSwarmManagerRestore(c *check.C) {
|
| 695 | 695 |
} |
| 696 | 696 |
|
| 697 | 697 |
func (s *DockerSwarmSuite) TestApiSwarmScaleNoRollingUpdate(c *check.C) {
|
| 698 |
+ testRequires(c, Network) |
|
| 698 | 699 |
d := s.AddDaemon(c, true, true) |
| 699 | 700 |
|
| 700 | 701 |
instances := 2 |