beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Increase test timeouts for node state changes

Browse source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 2e5da44341)
This commit is contained in:
Tonis Tiigi 2016-06-23 17:30:15 -07:00 committed by Tibor Vass
parent e546ffb37a
commit de5fd9d641
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
integration-cli/docker_api_swarm_test.go
View file

@ -111,8 +111,8 @@ func (s *DockerSwarmSuite) testAPISwarmManualAcceptance(c *check.C, secret strin
if info.LocalNodeState == swarm.LocalNodeStateActive { if info.LocalNodeState == swarm.LocalNodeStateActive {
break break
} }
if i > 10 { if i > 100 {
c.Errorf("node did not become active") c.Fatalf("node did not become active")
} }
time.Sleep(200 * time.Millisecond) time.Sleep(200 * time.Millisecond)
} }
@ -249,7 +249,7 @@ func (s *DockerSwarmSuite) TestApiSwarmPromoteDemote(c *check.C) {
if info.ControlAvailable { if info.ControlAvailable {
break break
} }
if i > 10 { if i > 100 {
c.Errorf("node did not turn into manager") c.Errorf("node did not turn into manager")
} else { } else {
break break
@ -268,7 +268,7 @@ func (s *DockerSwarmSuite) TestApiSwarmPromoteDemote(c *check.C) {
if !info.ControlAvailable { if !info.ControlAvailable {
break break
} }
if i > 10 { if i > 100 {
c.Errorf("node did not turn into manager") c.Errorf("node did not turn into manager")
} else { } else {
break break
@ -563,11 +563,17 @@ func (s *DockerSwarmSuite) TestApiSwarmLeaveOnPendingJoin(c *check.C) {
go d2.Join("nosuchhost:1234", "", "", false) // will block on pending state go d2.Join("nosuchhost:1234", "", "", false) // will block on pending state
time.Sleep(1 * time.Second) for i := 0; ; i++ {
info, err := d2.info()
info, err := d2.info() c.Assert(err, checker.IsNil)
c.Assert(err, checker.IsNil) if info.LocalNodeState == swarm.LocalNodeStatePending {
c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStatePending) break
}
if i > 100 {
c.Fatalf("node did not go to pending state: %v", info.LocalNodeState)
}
time.Sleep(100 * time.Millisecond)
}
c.Assert(d2.Leave(true), checker.IsNil) c.Assert(d2.Leave(true), checker.IsNil)
@ -589,7 +595,7 @@ func (s *DockerSwarmSuite) TestApiSwarmRestoreOnPendingJoin(c *check.C) {
if info.LocalNodeState == swarm.LocalNodeStatePending { if info.LocalNodeState == swarm.LocalNodeStatePending {
break break
} }
if i > 10 { if i > 100 {
c.Fatalf("node did not go to pending state: %v", info.LocalNodeState) c.Fatalf("node did not go to pending state: %v", info.LocalNodeState)
} }
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)