Browse Source

functional: add TODO

Yicheng Qin 11 years ago
parent
commit
40279d324a
1 changed files with 8 additions and 6 deletions
  1. 8 6
      functional/cluster_test.go

+ 8 - 6
functional/cluster_test.go

@@ -36,6 +36,7 @@ func testCluster(t *testing.T, size int) {
 	c.Terminate(t)
 	c.Terminate(t)
 }
 }
 
 
+// TODO: use etcd client
 func setKey(u url.URL, key string, value string) error {
 func setKey(u url.URL, key string, value string) error {
 	u.Path = "/v2/keys" + key
 	u.Path = "/v2/keys" + key
 	v := url.Values{"value": []string{value}}
 	v := url.Values{"value": []string{value}}
@@ -62,28 +63,29 @@ type cluster struct {
 	Members []member
 	Members []member
 }
 }
 
 
+// TODO: support TLS
 func (c *cluster) Launch(t *testing.T) {
 func (c *cluster) Launch(t *testing.T) {
 	if c.Size <= 0 {
 	if c.Size <= 0 {
 		t.Fatalf("cluster size <= 0")
 		t.Fatalf("cluster size <= 0")
 	}
 	}
 
 
-	peerListeners := make([]net.Listener, c.Size)
-	peerAddrs := make([]string, c.Size)
+	lns := make([]net.Listener, c.Size)
+	btConfs := 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
-		peerListeners[i] = l
-		peerAddrs[i] = fmt.Sprintf("%s=%s", c.name(i), "http://"+l.Addr().String())
+		lns[i] = l
+		btConfs[i] = fmt.Sprintf("%s=%s", c.name(i), "http://"+l.Addr().String())
 	}
 	}
 	clusterConfig := &etcdserver.Cluster{}
 	clusterConfig := &etcdserver.Cluster{}
-	if err := clusterConfig.Set(strings.Join(peerAddrs, ",")); err != nil {
+	if err := clusterConfig.Set(strings.Join(btConfs, ",")); err != nil {
 		t.Fatal(err)
 		t.Fatal(err)
 	}
 	}
 
 
 	var err error
 	var err error
 	for i := 0; i < c.Size; i++ {
 	for i := 0; i < c.Size; i++ {
 		m := member{}
 		m := member{}
-		m.PeerListeners = []net.Listener{peerListeners[i]}
+		m.PeerListeners = []net.Listener{lns[i]}
 		cln := newLocalListener(t)
 		cln := newLocalListener(t)
 		m.ClientListeners = []net.Listener{cln}
 		m.ClientListeners = []net.Listener{cln}