From 5ba46f625f98b9bb0889b146e6ec9a2dcca68060 Mon Sep 17 00:00:00 2001 From: Piotr Tabor Date: Tue, 29 Sep 2020 23:21:47 +0200 Subject: [PATCH] pkg/mock: Update imports to point on new files locations. find ./ -name '*.go' | xargs sed -i 's|go.etcd.io/etcd/v3/pkg/mock/mockserver|go.etcd.io/etcd/v3/client/mock/mockserver|g' find ./ -name '*.go' | xargs sed -i 's|go.etcd.io/etcd/v3/pkg/mock|go.etcd.io/etcd/v3/server/mock|g' go fmt ./... --- clientv3/balancer/balancer_test.go | 2 +- etcdserver/api/membership/cluster_test.go | 2 +- etcdserver/raft_test.go | 2 +- etcdserver/server_test.go | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clientv3/balancer/balancer_test.go b/clientv3/balancer/balancer_test.go index 28ace00fd..0ccd2abaa 100644 --- a/clientv3/balancer/balancer_test.go +++ b/clientv3/balancer/balancer_test.go @@ -22,9 +22,9 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/v3/client/mock/mockserver" "go.etcd.io/etcd/v3/clientv3/balancer/picker" "go.etcd.io/etcd/v3/clientv3/balancer/resolver/endpoint" - "go.etcd.io/etcd/v3/pkg/mock/mockserver" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/etcdserver/api/membership/cluster_test.go b/etcdserver/api/membership/cluster_test.go index affb10e1d..467ce6f26 100644 --- a/etcdserver/api/membership/cluster_test.go +++ b/etcdserver/api/membership/cluster_test.go @@ -24,10 +24,10 @@ import ( "github.com/coreos/go-semver/semver" "go.etcd.io/etcd/v3/etcdserver/api/v2store" - "go.etcd.io/etcd/v3/pkg/mock/mockstore" "go.etcd.io/etcd/v3/pkg/testutil" "go.etcd.io/etcd/v3/pkg/types" "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/v3/server/mock/mockstore" "go.uber.org/zap" ) diff --git a/etcdserver/raft_test.go b/etcdserver/raft_test.go index 58067187e..4bcbf451f 100644 --- a/etcdserver/raft_test.go +++ b/etcdserver/raft_test.go @@ -23,11 +23,11 @@ import ( "time" "go.etcd.io/etcd/v3/etcdserver/api/membership" - "go.etcd.io/etcd/v3/pkg/mock/mockstorage" "go.etcd.io/etcd/v3/pkg/pbutil" "go.etcd.io/etcd/v3/pkg/types" "go.etcd.io/etcd/v3/raft" "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/v3/server/mock/mockstorage" "go.uber.org/zap" ) diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go index fb34d2283..02393c535 100644 --- a/etcdserver/server_test.go +++ b/etcdserver/server_test.go @@ -38,15 +38,15 @@ import ( "go.etcd.io/etcd/v3/mvcc/backend" "go.etcd.io/etcd/v3/pkg/fileutil" "go.etcd.io/etcd/v3/pkg/idutil" - "go.etcd.io/etcd/v3/pkg/mock/mockstorage" - "go.etcd.io/etcd/v3/pkg/mock/mockstore" - "go.etcd.io/etcd/v3/pkg/mock/mockwait" "go.etcd.io/etcd/v3/pkg/pbutil" "go.etcd.io/etcd/v3/pkg/testutil" "go.etcd.io/etcd/v3/pkg/types" "go.etcd.io/etcd/v3/pkg/wait" "go.etcd.io/etcd/v3/raft" "go.etcd.io/etcd/v3/raft/raftpb" + "go.etcd.io/etcd/v3/server/mock/mockstorage" + "go.etcd.io/etcd/v3/server/mock/mockstore" + "go.etcd.io/etcd/v3/server/mock/mockwait" "go.uber.org/zap" )