Browse Source

Merge pull request #1501 from bcwaldon/rename-members-tests

etcdhttp: s/TestServeAdminMembers*/TestServeMembers*/
Brian Waldon 11 years ago
parent
commit
b7b3bf40e0
1 changed files with 4 additions and 4 deletions
  1. 4 4
      etcdserver/etcdhttp/client_test.go

+ 4 - 4
etcdserver/etcdhttp/client_test.go

@@ -549,7 +549,7 @@ func TestGoodParseRequest(t *testing.T) {
 	}
 	}
 }
 }
 
 
-func TestServeAdminMembers(t *testing.T) {
+func TestServeMembers(t *testing.T) {
 	memb1 := etcdserver.Member{ID: 12, Attributes: etcdserver.Attributes{ClientURLs: []string{"http://localhost:8080"}}}
 	memb1 := etcdserver.Member{ID: 12, Attributes: etcdserver.Attributes{ClientURLs: []string{"http://localhost:8080"}}}
 	memb2 := etcdserver.Member{ID: 13, Attributes: etcdserver.Attributes{ClientURLs: []string{"http://localhost:8081"}}}
 	memb2 := etcdserver.Member{ID: 13, Attributes: etcdserver.Attributes{ClientURLs: []string{"http://localhost:8081"}}}
 	cluster := &fakeCluster{
 	cluster := &fakeCluster{
@@ -601,7 +601,7 @@ func TestServeAdminMembers(t *testing.T) {
 	}
 	}
 }
 }
 
 
-func TestServeAdminMembersCreate(t *testing.T) {
+func TestServeMembersCreate(t *testing.T) {
 	u := mustNewURL(t, membersPrefix)
 	u := mustNewURL(t, membersPrefix)
 	b := []byte(`{"peerURLs":["http://127.0.0.1:1"]}`)
 	b := []byte(`{"peerURLs":["http://127.0.0.1:1"]}`)
 	req, err := http.NewRequest("POST", u.String(), bytes.NewReader(b))
 	req, err := http.NewRequest("POST", u.String(), bytes.NewReader(b))
@@ -653,7 +653,7 @@ func TestServeAdminMembersCreate(t *testing.T) {
 	}
 	}
 }
 }
 
 
-func TestServeAdminMembersDelete(t *testing.T) {
+func TestServeMembersDelete(t *testing.T) {
 	req := &http.Request{
 	req := &http.Request{
 		Method: "DELETE",
 		Method: "DELETE",
 		URL:    mustNewURL(t, path.Join(membersPrefix, "BEEF")),
 		URL:    mustNewURL(t, path.Join(membersPrefix, "BEEF")),
@@ -686,7 +686,7 @@ func TestServeAdminMembersDelete(t *testing.T) {
 	}
 	}
 }
 }
 
 
-func TestServeAdminMembersFail(t *testing.T) {
+func TestServeMembersFail(t *testing.T) {
 	tests := []struct {
 	tests := []struct {
 		req    *http.Request
 		req    *http.Request
 		server etcdserver.Server
 		server etcdserver.Server