Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

integration: clean code

Browse Source 
remove extra space, rename variables, remove unused function.
This commit is contained in:
Yicheng Qin 2014-10-17 11:30:52 -07:00
parent 7af679333a
commit 500a72962e
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
integration/cluster_test.go
View File

@ -64,8 +64,7 @@ func setKey(u url.URL, key string, value string) error {
}
type cluster struct {
Size int
Size int
Members []member
}
@ -76,15 +75,15 @@ func (c *cluster) Launch(t *testing.T) {
}
lns := make([]net.Listener, c.Size)
btConfs := make([]string, c.Size)
bootstrapCfgs := make([]string, c.Size)
for i := 0; i < c.Size; i++ {
l := newLocalListener(t)
// each member claims only one peer listener
lns[i] = l
btConfs[i] = fmt.Sprintf("%s=%s", c.name(i), "http://"+l.Addr().String())
bootstrapCfgs[i] = fmt.Sprintf("%s=%s", c.name(i), "http://"+l.Addr().String())
}
clusterConfig := &etcdserver.Cluster{}
if err := clusterConfig.Set(strings.Join(btConfs, ",")); err != nil {
clusterCfg := &etcdserver.Cluster{}
if err := clusterCfg.Set(strings.Join(bootstrapCfgs, ",")); err != nil {
t.Fatal(err)
}
@ -94,7 +93,6 @@ func (c *cluster) Launch(t *testing.T) {
m.PeerListeners = []net.Listener{lns[i]}
cln := newLocalListener(t)
m.ClientListeners = []net.Listener{cln}
m.Name = c.name(i)
m.ClientURLs, err = types.NewURLs([]string{"http://" + cln.Addr().String()})
if err != nil {
@ -104,7 +102,7 @@ func (c *cluster) Launch(t *testing.T) {
if err != nil {
t.Fatal(err)
}
m.Cluster = clusterConfig
m.Cluster = clusterCfg
m.ClusterState = etcdserver.ClusterStateValueNew
m.Transport, err = transport.NewTransport(transport.TLSInfo{})
if err != nil {
@ -174,10 +172,6 @@ func (m *member) Start(t *testing.T) {
panic("unimplemented")
}
func (m *member) Reboot(t *testing.T) {
panic("unimplemented")
}
func (m *member) Terminate(t *testing.T) {
m.s.Stop()
for _, hs := range m.hss {