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

Merge pull request #6243 from xiang90/fix_m

Browse Source 
e2e: remove server testing in etcdctl test
This commit is contained in:
Xiang Li 2016-08-22 16:14:51 -07:00 committed by GitHub
commit 13f79affb6
1 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
e2e/ctl_v3_member_test.go
View File

@ -84,21 +84,12 @@ func memberRemoveTest(cx ctlCtx) {
}
var (
n2 = n1 - 1
memIDToRemove = fmt.Sprintf("%x", resp.Header.MemberId)
cluserID = fmt.Sprintf("%x", resp.Header.ClusterId)
)
if err = ctlV3MemberRemove(cx, memIDToRemove, cluserID); err != nil {
cx.t.Fatal(err)
}
resp, err = getMemberList(cx)
if err != nil {
cx.t.Fatal(err)
}
if n2 != len(resp.Members) {
cx.t.Fatalf("expected %d, got %d", n2, len(resp.Members))
}
}
func ctlV3MemberRemove(cx ctlCtx, memberID, clusterID string) error {
@ -112,27 +103,6 @@ func memberAddTest(cx ctlCtx) {
if err := spawnWithExpect(cmdArgs, " added to cluster "); err != nil {
cx.t.Fatal(err)
}
mresp, err := getMemberList(cx)
if err != nil {
cx.t.Fatal(err)
}
if len(mresp.Members) != 2 {
cx.t.Fatalf("expected 2, got %d", len(mresp.Members))
}
found := false
for _, mem := range mresp.Members {
for _, v := range mem.PeerURLs {
if v == peerURL {
found = true
break
}
}
}
if !found {
cx.t.Fatalf("expected %s in PeerURLs, got %+v", peerURL, mresp.Members)
}
}
func memberUpdateTest(cx ctlCtx) {
@ -146,16 +116,4 @@ func memberUpdateTest(cx ctlCtx) {
if err = spawnWithExpect(cmdArgs, " updated in cluster "); err != nil {
cx.t.Fatal(err)
}
mresp, err := getMemberList(cx)
if err != nil {
cx.t.Fatal(err)
}
if len(mresp.Members) != 1 {
cx.t.Fatalf("expected 1, got %d", len(mresp.Members))
}
if mresp.Members[0].PeerURLs[0] != peerURL {
cx.t.Fatalf("expected %s in PeerURLs, got %+v", peerURL, mresp.Members)
}
}