From 3cc2311c54c5825ff46a72f1487028b3cc4cd739 Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Thu, 26 May 2016 14:35:57 -0700 Subject: [PATCH 1/2] Increase etcd test server up timeout to wait.ForeverTestTimeout --- pkg/storage/etcd/testing/utils.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/storage/etcd/testing/utils.go b/pkg/storage/etcd/testing/utils.go index d46085e4cb3..592683128ba 100644 --- a/pkg/storage/etcd/testing/utils.go +++ b/pkg/storage/etcd/testing/utils.go @@ -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") From 672cd640359e8838bd49e445ee1b7e4856c27ea4 Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Thu, 26 May 2016 14:37:12 -0700 Subject: [PATCH 2/2] Disallow returning nil server in NewEtcdTestClientServer --- pkg/storage/etcd/testing/utils.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/storage/etcd/testing/utils.go b/pkg/storage/etcd/testing/utils.go index 592683128ba..aaa7b67a82d 100644 --- a/pkg/storage/etcd/testing/utils.go +++ b/pkg/storage/etcd/testing/utils.go @@ -239,13 +239,13 @@ func NewEtcdTestClientServer(t *testing.T) *EtcdTestServer { } server.Client, err = etcd.New(cfg) if err != nil { - t.Errorf("Unexpected error in NewEtcdTestClientServer (%v)", err) server.Terminate(t) + t.Fatalf("Unexpected error in NewEtcdTestClientServer (%v)", err) return nil } if err := server.waitUntilUp(); err != nil { - t.Errorf("Unexpected error in waitUntilUp (%v)", err) server.Terminate(t) + t.Fatalf("Unexpected error in waitUntilUp (%v)", err) return nil } return server