github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

fix EtcdTestServer

Browse Source
This commit is contained in:
Hongchao Deng 2016-03-11 19:41:07 -08:00
parent 16a7aae032
commit 0a1ff0bb0b
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/storage/etcd/testing/utils.go
View File

@ -30,9 +30,9 @@ import (
etcd "github.com/coreos/etcd/client" etcd "github.com/coreos/etcd/client"
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/etcdhttp" "github.com/coreos/etcd/etcdserver/etcdhttp"
"github.com/coreos/etcd/pkg/testutil"
"github.com/coreos/etcd/pkg/transport" "github.com/coreos/etcd/pkg/transport"
"github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/pkg/types"
"github.com/coreos/etcd/rafthttp"
"github.com/golang/glog" "github.com/golang/glog"
"golang.org/x/net/context" "golang.org/x/net/context"
) )
@ -88,7 +88,7 @@ func newHttpTransport(t *testing.T, certFile, keyFile, caFile string) etcd.Cance
KeyFile: keyFile, KeyFile: keyFile,
CAFile: caFile, CAFile: caFile,
} }
tr, err := transport.NewTransport(tlsInfo) tr, err := transport.NewTransport(tlsInfo, time.Second)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -142,10 +142,7 @@ func configureTestCluster(t *testing.T, name string) *EtcdTestServer {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
m.Transport, err = transport.NewTimeoutTransport(transport.TLSInfo{}, time.Second, rafthttp.ConnReadTimeout, rafthttp.ConnWriteTimeout) m.InitialClusterToken = "TestEtcd"
if err != nil {
t.Fatal(err)
}
m.NewCluster = true m.NewCluster = true
m.ForceNewCluster = false m.ForceNewCluster = false
m.ElectionTicks = 10 m.ElectionTicks = 10
@ -162,7 +159,7 @@ func (m *EtcdTestServer) launch(t *testing.T) error {
} }
m.s.SyncTicker = time.Tick(500 * time.Millisecond) m.s.SyncTicker = time.Tick(500 * time.Millisecond)
m.s.Start() m.s.Start()
m.raftHandler = etcdhttp.NewPeerHandler(m.s.Cluster(), m.s.RaftHandler()) m.raftHandler = &testutil.PauseableHandler{Next: etcdhttp.NewPeerHandler(m.s)}
for _, ln := range m.PeerListeners { for _, ln := range m.PeerListeners {
hs := &httptest.Server{ hs := &httptest.Server{
Listener: ln, Listener: ln,