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: add TestDoubleTLSCluster

Browse Source
This commit is contained in:
Yicheng Qin 2015-04-02 10:08:40 -07:00
parent ccb0934e22
commit 73936d1874
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
integration/cluster_test.go
View File

@ -138,6 +138,18 @@ func testDoubleClusterSize(t *testing.T, size int) {
clusterMustProgress(t, c.Members) clusterMustProgress(t, c.Members)
} }
func TestDoubleTLSClusterSizeOf3(t *testing.T) {
defer afterTest(t)
c := NewTLSCluster(t, 3)
c.Launch(t)
defer c.Terminate(t)
for i := 0; i < 3; i++ {
c.AddTLSMember(t)
}
clusterMustProgress(t, c.Members)
}
func TestDecreaseClusterSizeOf3(t *testing.T) { testDecreaseClusterSize(t, 3) } func TestDecreaseClusterSizeOf3(t *testing.T) { testDecreaseClusterSize(t, 3) }
func TestDecreaseClusterSizeOf5(t *testing.T) { testDecreaseClusterSize(t, 5) } func TestDecreaseClusterSizeOf5(t *testing.T) { testDecreaseClusterSize(t, 5) }
@ -345,17 +357,20 @@ func (c *cluster) HTTPMembers() []client.Member {
return ms return ms
} }
func (c *cluster) AddMember(t *testing.T) { func (c *cluster) addMember(t *testing.T, usePeerTLS bool) {
clusterStr := c.Members[0].Cluster.String() clusterStr := c.Members[0].Cluster.String()
idx := len(c.Members) idx := len(c.Members)
// TODO: support add TLS member m := mustNewMember(t, c.name(idx), usePeerTLS)
m := mustNewMember(t, c.name(idx), false) scheme := "http"
if usePeerTLS {
scheme = "https"
}
// send add request to the cluster // send add request to the cluster
cc := mustNewHTTPClient(t, []string{c.URL(0)}) cc := mustNewHTTPClient(t, []string{c.URL(0)})
ma := client.NewMembersAPI(cc) ma := client.NewMembersAPI(cc)
ctx, cancel := context.WithTimeout(context.Background(), requestTimeout) ctx, cancel := context.WithTimeout(context.Background(), requestTimeout)
peerURL := "http://" + m.PeerListeners[0].Addr().String() peerURL := scheme + "://" + m.PeerListeners[0].Addr().String()
if _, err := ma.Add(ctx, peerURL); err != nil { if _, err := ma.Add(ctx, peerURL); err != nil {
t.Fatalf("add member on %s error: %v", c.URL(0), err) t.Fatalf("add member on %s error: %v", c.URL(0), err)
} }
@ -366,7 +381,7 @@ func (c *cluster) AddMember(t *testing.T) {
c.waitMembersMatch(t, members) c.waitMembersMatch(t, members)
for _, ln := range m.PeerListeners { for _, ln := range m.PeerListeners {
clusterStr += fmt.Sprintf(",%s=http://%s", m.Name, ln.Addr().String()) clusterStr += fmt.Sprintf(",%s=%s://%s", m.Name, scheme, ln.Addr().String())
} }
var err error var err error
m.Cluster, err = etcdserver.NewClusterFromString(clusterName, clusterStr) m.Cluster, err = etcdserver.NewClusterFromString(clusterName, clusterStr)
@ -382,6 +397,14 @@ func (c *cluster) AddMember(t *testing.T) {
c.waitMembersMatch(t, c.HTTPMembers()) c.waitMembersMatch(t, c.HTTPMembers())
} }
func (c *cluster) AddMember(t *testing.T) {
c.addMember(t, false)
}
func (c *cluster) AddTLSMember(t *testing.T) {
c.addMember(t, true)
}
func (c *cluster) RemoveMember(t *testing.T, id uint64) { func (c *cluster) RemoveMember(t *testing.T, id uint64) {
// send remove request to the cluster // send remove request to the cluster
cc := mustNewHTTPClient(t, []string{c.URL(0)}) cc := mustNewHTTPClient(t, []string{c.URL(0)})