Browse Source

integration: clean code

remove extra space, rename variables, remove unused function.
Yicheng Qin 11 years ago
parent
commit
500a72962e
1 changed files with 6 additions and 12 deletions
  1. 6 12
      integration/cluster_test.go

+ 6 - 12
integration/cluster_test.go

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