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: Use GetOptions to configure serializble get

Browse Source
This commit is contained in:
Marek Siarkowicz 2022-02-23 16:17:01 +01:00
parent 744dd077cd
commit def122871c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/framework/e2e.go
View File

@ -64,5 +64,5 @@ func (c e2eClient) Get(key string, opts ...testutils.GetOption) (*clientv3.GetRe
for _, opt := range opts {
opt(&o)
}
return c.EtcdctlV3.Get(key, o.Serializable)
return c.EtcdctlV3.Get(key, o)
}

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

@ -20,6 +20,7 @@ import (
"strings"
clientv3 "go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/tests/v3/framework/testutils"
)
type EtcdctlV3 struct {
@ -38,9 +39,9 @@ func (ctl *EtcdctlV3) DowngradeEnable(version string) error {
return SpawnWithExpect(ctl.cmdArgs("downgrade", "enable", version), "Downgrade enable success")
}
func (ctl *EtcdctlV3) Get(key string, serializable bool) (*clientv3.GetResponse, error) {
func (ctl *EtcdctlV3) Get(key string, o testutils.GetOptions) (*clientv3.GetResponse, error) {
args := ctl.cmdArgs()
if serializable {
if o.Serializable {
args = append(args, "--consistency", "s")
}
cmd, err := SpawnCmd(append(args, "get", key, "-w", "json"), nil)