Increase etcd test server up timeout to wait.ForeverTestTimeout

This commit is contained in:
Janet Kuo 2016-05-26 14:35:57 -07:00
parent f24b7a7391
commit 3cc2311c54

View File

@ -27,6 +27,8 @@ import (
"testing"
"time"
"k8s.io/kubernetes/pkg/util/wait"
etcd "github.com/coreos/etcd/client"
"github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/api/v2http"
@ -186,7 +188,7 @@ func (m *EtcdTestServer) launch(t *testing.T) error {
// waitForEtcd wait until etcd is propagated correctly
func (m *EtcdTestServer) waitUntilUp() error {
membersAPI := etcd.NewMembersAPI(m.Client)
for start := time.Now(); time.Since(start) < 5*time.Second; time.Sleep(10 * time.Millisecond) {
for start := time.Now(); time.Since(start) < wait.ForeverTestTimeout; time.Sleep(10 * time.Millisecond) {
members, err := membersAPI.List(context.TODO())
if err != nil {
glog.Errorf("Error when getting etcd cluster members")