From def122871c5f78d2c3482d91260c887bdb8fe737 Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Wed, 23 Feb 2022 16:17:01 +0100 Subject: [PATCH] tests: Use GetOptions to configure serializble get --- tests/framework/e2e.go | 2 +- tests/framework/e2e/etcdctl.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/framework/e2e.go b/tests/framework/e2e.go index 7dfc4b611..4593506ab 100644 --- a/tests/framework/e2e.go +++ b/tests/framework/e2e.go @@ -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) } diff --git a/tests/framework/e2e/etcdctl.go b/tests/framework/e2e/etcdctl.go index 68e1e438e..b0a53afd1 100644 --- a/tests/framework/e2e/etcdctl.go +++ b/tests/framework/e2e/etcdctl.go @@ -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)