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: Rename common client lease methods to match

Browse Source 
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
This commit is contained in:
Marek Siarkowicz 2022-08-25 14:22:59 +02:00
parent b7272df69f
commit 46fe4b8e1c
4 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/common/lease_test.go
View File

@ -119,7 +119,7 @@ func TestLeaseGrantAndList(t *testing.T) {
// or by hitting an up to date member. // or by hitting an up to date member.
leases := []clientv3.LeaseStatus{} leases := []clientv3.LeaseStatus{}
require.Eventually(t, func() bool { require.Eventually(t, func() bool {
resp, err := cc.LeaseList(ctx) resp, err := cc.Leases(ctx)
if err != nil { if err != nil {
return false return false
} }
@ -193,7 +193,7 @@ func TestLeaseGrantKeepAliveOnce(t *testing.T) {
leaseResp, err := cc.Grant(ctx, 2) leaseResp, err := cc.Grant(ctx, 2)
require.NoError(t, err) require.NoError(t, err)
_, err = cc.LeaseKeepAliveOnce(ctx, leaseResp.ID) _, err = cc.KeepAliveOnce(ctx, leaseResp.ID)
require.NoError(t, err) require.NoError(t, err)
time.Sleep(2 * time.Second) // Wait for the original lease to expire time.Sleep(2 * time.Second) // Wait for the original lease to expire
@ -229,7 +229,7 @@ func TestLeaseGrantRevoke(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, int64(1), getResp.Count) require.Equal(t, int64(1), getResp.Count)
_, err = cc.LeaseRevoke(ctx, leaseResp.ID) _, err = cc.Revoke(ctx, leaseResp.ID)
require.NoError(t, err) require.NoError(t, err)
ttlResp, err := cc.TimeToLive(ctx, leaseResp.ID, config.LeaseOption{}) ttlResp, err := cc.TimeToLive(ctx, leaseResp.ID, config.LeaseOption{})

6
tests/framework/e2e/etcdctl.go
View File

@ -392,7 +392,7 @@ func (ctl *EtcdctlV3) Defragment(ctx context.Context, o config.DefragOption) err
return err return err
} }
func (ctl *EtcdctlV3) LeaseList(ctx context.Context) (*clientv3.LeaseLeasesResponse, error) { func (ctl *EtcdctlV3) Leases(ctx context.Context) (*clientv3.LeaseLeasesResponse, error) {
args := ctl.cmdArgs("lease", "list", "-w", "json") args := ctl.cmdArgs("lease", "list", "-w", "json")
cmd, err := SpawnCmd(args, nil) cmd, err := SpawnCmd(args, nil)
if err != nil { if err != nil {
@ -408,7 +408,7 @@ func (ctl *EtcdctlV3) LeaseList(ctx context.Context) (*clientv3.LeaseLeasesRespo
return &resp, err return &resp, err
} }
func (ctl *EtcdctlV3) LeaseKeepAliveOnce(ctx context.Context, id clientv3.LeaseID) (*clientv3.LeaseKeepAliveResponse, error) { func (ctl *EtcdctlV3) KeepAliveOnce(ctx context.Context, id clientv3.LeaseID) (*clientv3.LeaseKeepAliveResponse, error) {
args := ctl.cmdArgs("lease", "keep-alive", strconv.FormatInt(int64(id), 16), "--once", "-w", "json") args := ctl.cmdArgs("lease", "keep-alive", strconv.FormatInt(int64(id), 16), "--once", "-w", "json")
cmd, err := SpawnCmd(args, nil) cmd, err := SpawnCmd(args, nil)
if err != nil { if err != nil {
@ -424,7 +424,7 @@ func (ctl *EtcdctlV3) LeaseKeepAliveOnce(ctx context.Context, id clientv3.LeaseI
return &resp, err return &resp, err
} }
func (ctl *EtcdctlV3) LeaseRevoke(ctx context.Context, id clientv3.LeaseID) (*clientv3.LeaseRevokeResponse, error) { func (ctl *EtcdctlV3) Revoke(ctx context.Context, id clientv3.LeaseID) (*clientv3.LeaseRevokeResponse, error) {
var resp clientv3.LeaseRevokeResponse var resp clientv3.LeaseRevokeResponse
err := ctl.spawnJsonCmd(ctx, &resp, "lease", "revoke", strconv.FormatInt(int64(id), 16)) err := ctl.spawnJsonCmd(ctx, &resp, "lease", "revoke", strconv.FormatInt(int64(id), 16))
return &resp, err return &resp, err

12
tests/framework/integration.go
View File

@ -258,18 +258,6 @@ func (c integrationClient) TimeToLive(ctx context.Context, id clientv3.LeaseID,
return c.Client.TimeToLive(ctx, id, leaseOpts...) return c.Client.TimeToLive(ctx, id, leaseOpts...)
} }
func (c integrationClient) LeaseList(ctx context.Context) (*clientv3.LeaseLeasesResponse, error) {
return c.Client.Leases(ctx)
}
func (c integrationClient) LeaseKeepAliveOnce(ctx context.Context, id clientv3.LeaseID) (*clientv3.LeaseKeepAliveResponse, error) {
return c.Client.KeepAliveOnce(ctx, id)
}
func (c integrationClient) LeaseRevoke(ctx context.Context, id clientv3.LeaseID) (*clientv3.LeaseRevokeResponse, error) {
return c.Client.Revoke(ctx, id)
}
func (c integrationClient) UserAdd(ctx context.Context, name, password string, opts config.UserAddOptions) (*clientv3.AuthUserAddResponse, error) { func (c integrationClient) UserAdd(ctx context.Context, name, password string, opts config.UserAddOptions) (*clientv3.AuthUserAddResponse, error) {
return c.Client.UserAddWithOptions(ctx, name, password, &clientv3.UserAddOptions{ return c.Client.UserAddWithOptions(ctx, name, password, &clientv3.UserAddOptions{
NoPassword: opts.NoPassword, NoPassword: opts.NoPassword,

6
tests/framework/interface.go
View File

@ -54,9 +54,9 @@ type Client interface {
AlarmDisarm(context context.Context, alarmMember *clientv3.AlarmMember) (*clientv3.AlarmResponse, error) AlarmDisarm(context context.Context, alarmMember *clientv3.AlarmMember) (*clientv3.AlarmResponse, error)
Grant(context context.Context, ttl int64) (*clientv3.LeaseGrantResponse, error) Grant(context context.Context, ttl int64) (*clientv3.LeaseGrantResponse, error)
TimeToLive(context context.Context, id clientv3.LeaseID, opts config.LeaseOption) (*clientv3.LeaseTimeToLiveResponse, error) TimeToLive(context context.Context, id clientv3.LeaseID, opts config.LeaseOption) (*clientv3.LeaseTimeToLiveResponse, error)
LeaseList(context context.Context) (*clientv3.LeaseLeasesResponse, error) Leases(context context.Context) (*clientv3.LeaseLeasesResponse, error)
LeaseKeepAliveOnce(context context.Context, id clientv3.LeaseID) (*clientv3.LeaseKeepAliveResponse, error) KeepAliveOnce(context context.Context, id clientv3.LeaseID) (*clientv3.LeaseKeepAliveResponse, error)
LeaseRevoke(context context.Context, id clientv3.LeaseID) (*clientv3.LeaseRevokeResponse, error) Revoke(context context.Context, id clientv3.LeaseID) (*clientv3.LeaseRevokeResponse, error)
UserAdd(context context.Context, name, password string, opts config.UserAddOptions) (*clientv3.AuthUserAddResponse, error) UserAdd(context context.Context, name, password string, opts config.UserAddOptions) (*clientv3.AuthUserAddResponse, error)
UserList(context context.Context) (*clientv3.AuthUserListResponse, error) UserList(context context.Context) (*clientv3.AuthUserListResponse, error)
UserDelete(context context.Context, name string) (*clientv3.AuthUserDeleteResponse, error) UserDelete(context context.Context, name string) (*clientv3.AuthUserDeleteResponse, error)