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: Implement remaining GetOptions fields

Browse Source
This commit is contained in:
Marek Siarkowicz 2022-02-24 13:13:18 +01:00
parent fd5cd9fd98
commit f7ee30cc41
6 changed files with 85 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/common/kv_test.go
View File

@ -33,7 +33,7 @@ func TestKVPut(t *testing.T) {
if err := cc.Put(key, value); err != nil {
t.Fatalf("count not put key %q, err: %s", key, err)
}
resp, err := cc.Get(key, testutils.WithSerializable())
resp, err := cc.Get(key, testutils.GetOptions{Serializable: true})
if err != nil {
t.Fatalf("count not get key %q, err: %s", key, err)
}

10
tests/framework/e2e.go
View File

@ -19,9 +19,7 @@ import (
"testing"
"go.etcd.io/etcd/client/pkg/v3/testutil"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/tests/v3/framework/e2e"
"go.etcd.io/etcd/tests/v3/framework/testutils"
)
type e2eRunner struct{}
@ -58,11 +56,3 @@ func (c *e2eCluster) Client() Client {
type e2eClient struct {
*e2e.EtcdctlV3
}
func (c e2eClient) Get(key string, opts ...testutils.GetOption) (*clientv3.GetResponse, error) {
o := testutils.GetOptions{}
for _, opt := range opts {
opt(&o)
}
return c.EtcdctlV3.Get(key, o)
}

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

@ -44,15 +44,64 @@ func (ctl *EtcdctlV3) Get(key string, o testutils.GetOptions) (*clientv3.GetResp
if o.Serializable {
args = append(args, "--consistency", "s")
}
cmd, err := SpawnCmd(append(args, "get", key, "-w", "json"), nil)
args = append(args, "get", key, "-w", "json")
if o.End != "" {
args = append(args, o.End)
}
if o.Revision != 0 {
args = append(args, fmt.Sprintf("--rev=%d", o.Revision))
}
if o.Prefix {
args = append(args, "--prefix")
}
if o.Limit != 0 {
args = append(args, fmt.Sprintf("--limit=%d", o.Limit))
}
if o.FromKey {
args = append(args, "--from-key")
}
if o.CountOnly {
args = append(args, "-w", "fields", "--count-only")
} else {
args = append(args, "-w", "json")
}
switch o.SortBy {
case clientv3.SortByCreateRevision:
args = append(args, "--sort-by=CREATE")
case clientv3.SortByModRevision:
args = append(args, "--sort-by=MODIFY")
case clientv3.SortByValue:
args = append(args, "--sort-by=VALUE")
case clientv3.SortByVersion:
args = append(args, "--sort-by=VERSION")
case clientv3.SortByKey:
// nothing
default:
return nil, fmt.Errorf("bad sort target %v", o.SortBy)
}
switch o.Order {
case clientv3.SortAscend:
args = append(args, "--order=ASCEND")
case clientv3.SortDescend:
args = append(args, "--order=DESCEND")
case clientv3.SortNone:
// nothing
default:
return nil, fmt.Errorf("bad sort order %v", o.Order)
}
cmd, err := SpawnCmd(args, nil)
if err != nil {
return nil, err
}
var resp clientv3.GetResponse
if o.CountOnly {
_, err := cmd.Expect("Count")
return &resp, err
}
line, err := cmd.Expect("kvs")
if err != nil {
return nil, err
}
var resp clientv3.GetResponse
err = json.Unmarshal([]byte(line), &resp)
return &resp, err
}

27
tests/framework/integration.go
View File

@ -63,15 +63,32 @@ type integrationClient struct {
*clientv3.Client
}
func (c integrationClient) Get(key string, opts ...testutils.GetOption) (*clientv3.GetResponse, error) {
o := testutils.GetOptions{}
for _, opt := range opts {
opt(&o)
}
func (c integrationClient) Get(key string, o testutils.GetOptions) (*clientv3.GetResponse, error) {
clientOpts := []clientv3.OpOption{}
if o.Revision != 0 {
clientOpts = append(clientOpts, clientv3.WithRev(int64(o.Revision)))
}
if o.End != "" {
clientOpts = append(clientOpts, clientv3.WithRange(o.End))
}
if o.Serializable {
clientOpts = append(clientOpts, clientv3.WithSerializable())
}
if o.Prefix {
clientOpts = append(clientOpts, clientv3.WithPrefix())
}
if o.Limit != 0 {
clientOpts = append(clientOpts, clientv3.WithLimit(int64(o.Limit)))
}
if o.FromKey {
clientOpts = append(clientOpts, clientv3.WithFromKey())
}
if o.CountOnly {
clientOpts = append(clientOpts, clientv3.WithCountOnly())
}
if o.SortBy != clientv3.SortByKey || o.Order != clientv3.SortNone {
clientOpts = append(clientOpts, clientv3.WithSort(o.SortBy, o.Order))
}
return c.Client.Get(context.Background(), key, clientOpts...)
}

2
tests/framework/interface.go
View File

@ -34,5 +34,5 @@ type Cluster interface {
type Client interface {
Put(key, value string) error
Get(key string, opts ...testutils.GetOption) (*clientv3.GetResponse, error)
Get(key string, opts testutils.GetOptions) (*clientv3.GetResponse, error)
}

18
tests/framework/testutils/options.go
View File

@ -14,14 +14,16 @@
package testutils
import clientv3 "go.etcd.io/etcd/client/v3"
type GetOptions struct {
Revision int
End string
CountOnly bool
Serializable bool
}
type GetOption func(*GetOptions)
func WithSerializable() GetOption {
return func(options *GetOptions) {
options.Serializable = true
}
Prefix bool
FromKey bool
Limit int
Order clientv3.SortOrder
SortBy clientv3.SortTarget
}