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

tests/common: address golangci var-naming issues

Browse Source 
Signed-off-by: Ivan Valdes <ivan@vald.es>
This commit is contained in:
Ivan Valdes 2024-03-20 22:24:52 -07:00
parent 6f55dfa26e
commit aeecfa00b4
No known key found for this signature in database
GPG Key ID: 4037D37741ED0CC5
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/common/auth_test.go
View File

@ -600,25 +600,25 @@ func TestAuthMemberRemove(t *testing.T) {
require.NoErrorf(t, setupAuth(cc, []authRole{testRole}, []authUser{rootUser, testUser}), "failed to enable auth")
rootAuthClient := testutils.MustClient(clus.Client(WithAuth(rootUserName, rootPassword)))
memberId, clusterId := memberToRemove(ctx, t, rootAuthClient, clusterSize)
delete(memberIDToEndpoints, memberId)
memberID, clusterID := memberToRemove(ctx, t, rootAuthClient, clusterSize)
delete(memberIDToEndpoints, memberID)
endpoints := make([]string, 0, len(memberIDToEndpoints))
for _, ep := range memberIDToEndpoints {
endpoints = append(endpoints, ep)
}
testUserAuthClient := testutils.MustClient(clus.Client(WithAuth(testUserName, testPassword)))
// ordinary user cannot remove a member
_, err := testUserAuthClient.MemberRemove(ctx, memberId)
_, err := testUserAuthClient.MemberRemove(ctx, memberID)
require.ErrorContains(t, err, PermissionDenied)
// root can remove a member, building a client excluding removed member endpoint
rootAuthClient2 := testutils.MustClient(clus.Client(WithAuth(rootUserName, rootPassword), WithEndpoints(endpoints)))
resp, err := rootAuthClient2.MemberRemove(ctx, memberId)
resp, err := rootAuthClient2.MemberRemove(ctx, memberID)
require.NoError(t, err)
require.Equal(t, resp.Header.ClusterId, clusterId)
require.Equal(t, resp.Header.ClusterId, clusterID)
found := false
for _, member := range resp.Members {
if member.ID == memberId {
if member.ID == memberID {
found = true
break
}

26
tests/common/member_test.go
View File

@ -58,7 +58,7 @@ func TestMemberList(t *testing.T) {
}
for _, m := range resp.Members {
if len(m.ClientURLs) == 0 {
t.Logf("member is not started, memberId:%d, memberName:%s", m.ID, m.Name)
t.Logf("member is not started, memberID:%d, memberName:%s", m.ID, m.Name)
return false
}
}
@ -210,8 +210,8 @@ func TestMemberRemove(t *testing.T) {
time.Sleep(etcdserver.HealthInterval)
}
memberId, clusterId := memberToRemove(ctx, t, cc, c.ClusterSize)
removeResp, err := cc.MemberRemove(ctx, memberId)
memberID, clusterID := memberToRemove(ctx, t, cc, c.ClusterSize)
removeResp, err := cc.MemberRemove(ctx, memberID)
if c.ClusterSize == 1 && quorumTc.expectSingleNodeError {
require.ErrorContains(t, err, "etcdserver: re-configuration failed due to not enough started members")
@ -225,15 +225,15 @@ func TestMemberRemove(t *testing.T) {
require.NoError(t, err, "MemberRemove failed")
t.Logf("removeResp.Members:%v", removeResp.Members)
if removeResp.Header.ClusterId != clusterId {
t.Fatalf("MemberRemove failed, expected ClusterId: %d, got: %d", clusterId, removeResp.Header.ClusterId)
if removeResp.Header.ClusterId != clusterID {
t.Fatalf("MemberRemove failed, expected ClusterID: %d, got: %d", clusterID, removeResp.Header.ClusterId)
}
if len(removeResp.Members) != c.ClusterSize-1 {
t.Fatalf("MemberRemove failed, expected length of members: %d, got: %d", c.ClusterSize-1, len(removeResp.Members))
}
for _, m := range removeResp.Members {
if m.ID == memberId {
t.Fatalf("MemberRemove failed, member(id=%d) is still in cluster", memberId)
if m.ID == memberID {
t.Fatalf("MemberRemove failed, member(id=%d) is still in cluster", memberID)
}
}
})
@ -246,15 +246,15 @@ func TestMemberRemove(t *testing.T) {
// If clusterSize == 1, return the only member.
// Otherwise, return a member that client has not connected to.
// It ensures that `MemberRemove` function does not return an "etcdserver: server stopped" error.
func memberToRemove(ctx context.Context, t *testing.T, client intf.Client, clusterSize int) (memberId uint64, clusterId uint64) {
func memberToRemove(ctx context.Context, t *testing.T, client intf.Client, clusterSize int) (memberID uint64, clusterID uint64) {
listResp, err := client.MemberList(ctx, false)
if err != nil {
t.Fatal(err)
}
clusterId = listResp.Header.ClusterId
clusterID = listResp.Header.ClusterId
if clusterSize == 1 {
memberId = listResp.Members[0].ID
memberID = listResp.Members[0].ID
} else {
// get status of the specific member that client has connected to
statusResp, err := client.Status(ctx)
@ -265,15 +265,15 @@ func memberToRemove(ctx context.Context, t *testing.T, client intf.Client, clust
// choose a member that client has not connected to
for _, m := range listResp.Members {
if m.ID != statusResp[0].Header.MemberId {
memberId = m.ID
memberID = m.ID
break
}
}
if memberId == 0 {
if memberID == 0 {
t.Fatalf("memberToRemove failed. listResp:%v, statusResp:%v", listResp, statusResp)
}
}
return memberId, clusterId
return memberID, clusterID
}
func getMemberIDToEndpoints(ctx context.Context, t *testing.T, clus intf.Cluster) (memberIDToEndpoints map[uint64]string) {