Browse code
Increase test timeouts for node state changes
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 2e5da4434126309f2395cc3d5b2013674155ae5c)
Tonis Tiigi authored on 2016/06/24 09:30:15Showing 1 changed files
| ... | ... |
@@ -111,8 +111,8 @@ func (s *DockerSwarmSuite) testAPISwarmManualAcceptance(c *check.C, secret strin |
| 111 | 111 |
if info.LocalNodeState == swarm.LocalNodeStateActive {
|
| 112 | 112 |
break |
| 113 | 113 |
} |
| 114 |
- if i > 10 {
|
|
| 115 |
- c.Errorf("node did not become active")
|
|
| 114 |
+ if i > 100 {
|
|
| 115 |
+ c.Fatalf("node did not become active")
|
|
| 116 | 116 |
} |
| 117 | 117 |
time.Sleep(200 * time.Millisecond) |
| 118 | 118 |
} |
| ... | ... |
@@ -249,7 +249,7 @@ func (s *DockerSwarmSuite) TestApiSwarmPromoteDemote(c *check.C) {
|
| 249 | 249 |
if info.ControlAvailable {
|
| 250 | 250 |
break |
| 251 | 251 |
} |
| 252 |
- if i > 10 {
|
|
| 252 |
+ if i > 100 {
|
|
| 253 | 253 |
c.Errorf("node did not turn into manager")
|
| 254 | 254 |
} else {
|
| 255 | 255 |
break |
| ... | ... |
@@ -268,7 +268,7 @@ func (s *DockerSwarmSuite) TestApiSwarmPromoteDemote(c *check.C) {
|
| 268 | 268 |
if !info.ControlAvailable {
|
| 269 | 269 |
break |
| 270 | 270 |
} |
| 271 |
- if i > 10 {
|
|
| 271 |
+ if i > 100 {
|
|
| 272 | 272 |
c.Errorf("node did not turn into manager")
|
| 273 | 273 |
} else {
|
| 274 | 274 |
break |
| ... | ... |
@@ -563,11 +563,17 @@ func (s *DockerSwarmSuite) TestApiSwarmLeaveOnPendingJoin(c *check.C) {
|
| 563 | 563 |
|
| 564 | 564 |
go d2.Join("nosuchhost:1234", "", "", false) // will block on pending state
|
| 565 | 565 |
|
| 566 |
- time.Sleep(1 * time.Second) |
|
| 567 |
- |
|
| 568 |
- info, err := d2.info() |
|
| 569 |
- c.Assert(err, checker.IsNil) |
|
| 570 |
- c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStatePending) |
|
| 566 |
+ for i := 0; ; i++ {
|
|
| 567 |
+ info, err := d2.info() |
|
| 568 |
+ c.Assert(err, checker.IsNil) |
|
| 569 |
+ if info.LocalNodeState == swarm.LocalNodeStatePending {
|
|
| 570 |
+ break |
|
| 571 |
+ } |
|
| 572 |
+ if i > 100 {
|
|
| 573 |
+ c.Fatalf("node did not go to pending state: %v", info.LocalNodeState)
|
|
| 574 |
+ } |
|
| 575 |
+ time.Sleep(100 * time.Millisecond) |
|
| 576 |
+ } |
|
| 571 | 577 |
|
| 572 | 578 |
c.Assert(d2.Leave(true), checker.IsNil) |
| 573 | 579 |
|
| ... | ... |
@@ -589,7 +595,7 @@ func (s *DockerSwarmSuite) TestApiSwarmRestoreOnPendingJoin(c *check.C) {
|
| 589 | 589 |
if info.LocalNodeState == swarm.LocalNodeStatePending {
|
| 590 | 590 |
break |
| 591 | 591 |
} |
| 592 |
- if i > 10 {
|
|
| 592 |
+ if i > 100 {
|
|
| 593 | 593 |
c.Fatalf("node did not go to pending state: %v", info.LocalNodeState)
|
| 594 | 594 |
} |
| 595 | 595 |
time.Sleep(100 * time.Millisecond) |