consul: improve test reliability for session ttls

This commit is contained in:
Ryan Uber 2015-01-09 17:18:11 -08:00
parent 44efa3cca4
commit 084643abee

View file

@ -352,7 +352,7 @@ func TestServer_SessionTTL_Failover(t *testing.T) {
}
// Find the new leader
time.Sleep(200 * time.Millisecond)
testutil.WaitForResult(func() (bool, error) {
leader = nil
for _, s := range servers {
if s.IsLeader() {
@ -360,11 +360,16 @@ func TestServer_SessionTTL_Failover(t *testing.T) {
}
}
if leader == nil {
t.Fatalf("Should have a new leader")
return false, fmt.Errorf("Should have a new leader")
}
// Ensure session timer is restored
if _, ok := leader.sessionTimers[id1]; !ok {
t.Fatalf("missing session timer")
return false, fmt.Errorf("missing session timer")
}
return true, nil
}, func(err error) {
t.Fatalf("err: %s", err)
})
}