tests: Migrate key value Get to common framework

This commit is contained in:
nic-chen
2022-03-19 00:46:42 +08:00
parent 34f0ab4f4f
commit dca5874d44
5 changed files with 113 additions and 4 deletions

View File

@@ -23,7 +23,8 @@ const (
)
type ClusterConfig struct {
ClusterSize int
PeerTLS TLSConfig
ClientTLS TLSConfig
ClusterSize int
PeerTLS TLSConfig
ClientTLS TLSConfig
QuotaBackendBytes int64
}

View File

@@ -241,7 +241,13 @@ func (ctl *EtcdctlV3) Health() error {
lines[i] = "is healthy"
}
return SpawnWithExpects(args, map[string]string{}, lines...)
}
func (ctl *EtcdctlV3) Alarm(cmd string) (*clientv3.AlarmResponse, error) {
args := ctl.cmdArgs()
args = append(args, "alarm", cmd)
return nil, SpawnWithExpect(args, "alarm:NOSPACE")
}
func (ctl *EtcdctlV3) Defragment(o config.DefragOption) error {

View File

@@ -45,6 +45,7 @@ func (e integrationRunner) NewCluster(t testing.TB, cfg config.ClusterConfig) Cl
var integrationCfg integration.ClusterConfig
integrationCfg.Size = cfg.ClusterSize
integrationCfg.ClientTLS, err = tlsInfo(t, cfg.ClientTLS)
integrationCfg.QuotaBackendBytes = cfg.QuotaBackendBytes
if err != nil {
t.Fatalf("ClientTLS: %s", err)
}
@@ -159,6 +160,14 @@ func (c integrationClient) Compact(rev int64, o config.CompactOption) (*clientv3
return c.Client.Compact(ctx, rev, clientOpts...)
}
func (c integrationClient) Alarm(cmd string) (*clientv3.AlarmResponse, error) {
ctx := context.Background()
if cmd == "list" {
return c.Client.AlarmList(ctx)
}
return c.Client.AlarmDisarm(ctx, nil)
}
func (c integrationClient) Status() ([]*clientv3.StatusResponse, error) {
endpoints := c.Client.Endpoints()
var resp []*clientv3.StatusResponse

View File

@@ -37,9 +37,9 @@ type Client interface {
Get(key string, opts config.GetOptions) (*clientv3.GetResponse, error)
Delete(key string, opts config.DeleteOptions) (*clientv3.DeleteResponse, error)
Compact(rev int64, opts config.CompactOption) (*clientv3.CompactResponse, error)
Status() ([]*clientv3.StatusResponse, error)
HashKV(rev int64) ([]*clientv3.HashKVResponse, error)
Health() error
Defragment(opts config.DefragOption) error
Alarm(cmd string) (*clientv3.AlarmResponse, error)
}