From b27b17b44ca79494d1cf83ead224230de66f74fb Mon Sep 17 00:00:00 2001 From: Piotr Tabor Date: Wed, 7 Oct 2020 15:15:22 +0200 Subject: [PATCH] tests/functional: Mechanical rename of imports etcd/v3/integration/ -> etcd/tests/v3/integration/... --- clientv3/main_test.go | 2 +- clientv3/naming/grpc_test.go | 2 +- clientv3/ordering/util_test.go | 2 +- tests/go.mod | 2 ++ tests/integration/client/client_test.go | 2 +- tests/integration/client/examples/main_test.go | 2 +- tests/integration/clientv3/black_hole_test.go | 2 +- tests/integration/clientv3/cluster_test.go | 2 +- tests/integration/clientv3/concurrency/main_test.go | 2 +- tests/integration/clientv3/dial_test.go | 2 +- tests/integration/clientv3/kv_test.go | 2 +- tests/integration/clientv3/lease_test.go | 2 +- tests/integration/clientv3/leasing_test.go | 2 +- tests/integration/clientv3/maintenance_test.go | 2 +- tests/integration/clientv3/metrics_test.go | 2 +- tests/integration/clientv3/mirror_test.go | 2 +- tests/integration/clientv3/namespace_test.go | 2 +- tests/integration/clientv3/network_partition_test.go | 2 +- tests/integration/clientv3/ordering_kv_test.go | 2 +- tests/integration/clientv3/role_test.go | 2 +- tests/integration/clientv3/server_shutdown_test.go | 2 +- tests/integration/clientv3/txn_test.go | 2 +- tests/integration/clientv3/user_test.go | 2 +- tests/integration/clientv3/watch_fragment_test.go | 2 +- tests/integration/clientv3/watch_test.go | 2 +- tests/integration/proxy/grpcproxy/cluster_test.go | 2 +- tests/integration/proxy/grpcproxy/kv_test.go | 2 +- tests/integration/proxy/grpcproxy/register_test.go | 2 +- tests/integration/v2store/main_test.go | 2 +- tests/integration/v2store/store_tag_v2v3_test.go | 2 +- 30 files changed, 31 insertions(+), 29 deletions(-) diff --git a/clientv3/main_test.go b/clientv3/main_test.go index d91473c8c..eeb4f52a4 100644 --- a/clientv3/main_test.go +++ b/clientv3/main_test.go @@ -16,8 +16,8 @@ package clientv3_test import ( "fmt" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc/grpclog" "os" diff --git a/clientv3/naming/grpc_test.go b/clientv3/naming/grpc_test.go index 8986ec3f9..2e08e8f5a 100644 --- a/clientv3/naming/grpc_test.go +++ b/clientv3/naming/grpc_test.go @@ -20,9 +20,9 @@ import ( "reflect" "testing" + "go.etcd.io/etcd/tests/v3/integration" etcd "go.etcd.io/etcd/v3/clientv3" namingv3 "go.etcd.io/etcd/v3/clientv3/naming" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc/naming" diff --git a/clientv3/ordering/util_test.go b/clientv3/ordering/util_test.go index b75ad5900..85b126dee 100644 --- a/clientv3/ordering/util_test.go +++ b/clientv3/ordering/util_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/tests/go.mod b/tests/go.mod index 2e7041824..b492c3e28 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -13,12 +13,14 @@ require ( github.com/golang/protobuf v1.3.2 github.com/grpc-ecosystem/grpc-gateway v1.9.5 github.com/prometheus/client_golang v1.0.0 + github.com/soheilhy/cmux v0.1.4 github.com/spf13/cobra v0.0.3 github.com/spf13/pflag v1.0.1 go.etcd.io/bbolt v1.3.5 go.etcd.io/etcd/api/v3 v3.0.0-00010101000000-000000000000 go.etcd.io/etcd/v3 v3.0.0-00010101000000-000000000000 go.uber.org/zap v1.15.0 + golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 google.golang.org/grpc v1.26.0 gopkg.in/yaml.v2 v2.2.2 diff --git a/tests/integration/client/client_test.go b/tests/integration/client/client_test.go index a83258be2..0cb37ff09 100644 --- a/tests/integration/client/client_test.go +++ b/tests/integration/client/client_test.go @@ -24,8 +24,8 @@ import ( "sync/atomic" "testing" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/client" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/tests/integration/client/examples/main_test.go b/tests/integration/client/examples/main_test.go index af5cbcd17..af6203cdc 100644 --- a/tests/integration/client/examples/main_test.go +++ b/tests/integration/client/examples/main_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "go.etcd.io/etcd/v3/pkg/transport" ) diff --git a/tests/integration/clientv3/black_hole_test.go b/tests/integration/clientv3/black_hole_test.go index 769bdbf42..b6d61b3f8 100644 --- a/tests/integration/clientv3/black_hole_test.go +++ b/tests/integration/clientv3/black_hole_test.go @@ -22,8 +22,8 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc" ) diff --git a/tests/integration/clientv3/cluster_test.go b/tests/integration/clientv3/cluster_test.go index cbb51cadd..b213ff974 100644 --- a/tests/integration/clientv3/cluster_test.go +++ b/tests/integration/clientv3/cluster_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "go.etcd.io/etcd/v3/pkg/types" ) diff --git a/tests/integration/clientv3/concurrency/main_test.go b/tests/integration/clientv3/concurrency/main_test.go index 6ffeefddf..c3d5bfc93 100644 --- a/tests/integration/clientv3/concurrency/main_test.go +++ b/tests/integration/clientv3/concurrency/main_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/tests/integration/clientv3/dial_test.go b/tests/integration/clientv3/dial_test.go index 9e62ce6ab..5ec7d69b3 100644 --- a/tests/integration/clientv3/dial_test.go +++ b/tests/integration/clientv3/dial_test.go @@ -22,8 +22,8 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "go.etcd.io/etcd/v3/pkg/transport" "google.golang.org/grpc" diff --git a/tests/integration/clientv3/kv_test.go b/tests/integration/clientv3/kv_test.go index 3e25430c8..6f254d5f6 100644 --- a/tests/integration/clientv3/kv_test.go +++ b/tests/integration/clientv3/kv_test.go @@ -28,8 +28,8 @@ import ( "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/version" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc" diff --git a/tests/integration/clientv3/lease_test.go b/tests/integration/clientv3/lease_test.go index 49815806c..7b59981c4 100644 --- a/tests/integration/clientv3/lease_test.go +++ b/tests/integration/clientv3/lease_test.go @@ -24,9 +24,9 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/concurrency" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/tests/integration/clientv3/leasing_test.go b/tests/integration/clientv3/leasing_test.go index 3b641899d..5688c6884 100644 --- a/tests/integration/clientv3/leasing_test.go +++ b/tests/integration/clientv3/leasing_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/concurrency" "go.etcd.io/etcd/v3/clientv3/leasing" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/tests/integration/clientv3/maintenance_test.go b/tests/integration/clientv3/maintenance_test.go index b3cea9dbb..cb1468f88 100644 --- a/tests/integration/clientv3/maintenance_test.go +++ b/tests/integration/clientv3/maintenance_test.go @@ -29,8 +29,8 @@ import ( "google.golang.org/grpc" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/lease" "go.etcd.io/etcd/v3/mvcc" "go.etcd.io/etcd/v3/mvcc/backend" diff --git a/tests/integration/clientv3/metrics_test.go b/tests/integration/clientv3/metrics_test.go index 6ef833f20..ca00307c3 100644 --- a/tests/integration/clientv3/metrics_test.go +++ b/tests/integration/clientv3/metrics_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "go.etcd.io/etcd/v3/pkg/transport" diff --git a/tests/integration/clientv3/mirror_test.go b/tests/integration/clientv3/mirror_test.go index 1d2397415..e2d67d119 100644 --- a/tests/integration/clientv3/mirror_test.go +++ b/tests/integration/clientv3/mirror_test.go @@ -23,8 +23,8 @@ import ( "time" "go.etcd.io/etcd/api/v3/mvccpb" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3/mirror" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/tests/integration/clientv3/namespace_test.go b/tests/integration/clientv3/namespace_test.go index 7fa5ced08..07e026f8d 100644 --- a/tests/integration/clientv3/namespace_test.go +++ b/tests/integration/clientv3/namespace_test.go @@ -20,9 +20,9 @@ import ( "testing" "go.etcd.io/etcd/api/v3/mvccpb" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/namespace" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/tests/integration/clientv3/network_partition_test.go b/tests/integration/clientv3/network_partition_test.go index e3523d325..b51ace570 100644 --- a/tests/integration/clientv3/network_partition_test.go +++ b/tests/integration/clientv3/network_partition_test.go @@ -24,8 +24,8 @@ import ( pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc" ) diff --git a/tests/integration/clientv3/ordering_kv_test.go b/tests/integration/clientv3/ordering_kv_test.go index f91c9382c..2719ddd35 100644 --- a/tests/integration/clientv3/ordering_kv_test.go +++ b/tests/integration/clientv3/ordering_kv_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/ordering" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/tests/integration/clientv3/role_test.go b/tests/integration/clientv3/role_test.go index 0a75cf47c..fa785c15c 100644 --- a/tests/integration/clientv3/role_test.go +++ b/tests/integration/clientv3/role_test.go @@ -19,7 +19,7 @@ import ( "testing" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/tests/integration/clientv3/server_shutdown_test.go b/tests/integration/clientv3/server_shutdown_test.go index a95c96237..6fe4dffc8 100644 --- a/tests/integration/clientv3/server_shutdown_test.go +++ b/tests/integration/clientv3/server_shutdown_test.go @@ -22,8 +22,8 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc/codes" diff --git a/tests/integration/clientv3/txn_test.go b/tests/integration/clientv3/txn_test.go index 050ae5011..fb953c6f4 100644 --- a/tests/integration/clientv3/txn_test.go +++ b/tests/integration/clientv3/txn_test.go @@ -21,9 +21,9 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/embed" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/tests/integration/clientv3/user_test.go b/tests/integration/clientv3/user_test.go index e697f3cb8..cee557449 100644 --- a/tests/integration/clientv3/user_test.go +++ b/tests/integration/clientv3/user_test.go @@ -20,8 +20,8 @@ import ( "time" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc" ) diff --git a/tests/integration/clientv3/watch_fragment_test.go b/tests/integration/clientv3/watch_fragment_test.go index 34ec3049b..1bb343386 100644 --- a/tests/integration/clientv3/watch_fragment_test.go +++ b/tests/integration/clientv3/watch_fragment_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/tests/integration/clientv3/watch_test.go b/tests/integration/clientv3/watch_test.go index 8e53f83f1..564153ef7 100644 --- a/tests/integration/clientv3/watch_test.go +++ b/tests/integration/clientv3/watch_test.go @@ -27,9 +27,9 @@ import ( mvccpb "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/version" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/etcdserver/api/v3rpc" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc/metadata" diff --git a/tests/integration/proxy/grpcproxy/cluster_test.go b/tests/integration/proxy/grpcproxy/cluster_test.go index 530531cb4..9e9843281 100644 --- a/tests/integration/proxy/grpcproxy/cluster_test.go +++ b/tests/integration/proxy/grpcproxy/cluster_test.go @@ -21,8 +21,8 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "go.uber.org/zap" diff --git a/tests/integration/proxy/grpcproxy/kv_test.go b/tests/integration/proxy/grpcproxy/kv_test.go index 86a3106de..aad051f41 100644 --- a/tests/integration/proxy/grpcproxy/kv_test.go +++ b/tests/integration/proxy/grpcproxy/kv_test.go @@ -21,8 +21,8 @@ import ( "time" pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "google.golang.org/grpc" diff --git a/tests/integration/proxy/grpcproxy/register_test.go b/tests/integration/proxy/grpcproxy/register_test.go index 7107254e7..6662e18f5 100644 --- a/tests/integration/proxy/grpcproxy/register_test.go +++ b/tests/integration/proxy/grpcproxy/register_test.go @@ -18,9 +18,9 @@ import ( "testing" "time" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/clientv3/naming" - "go.etcd.io/etcd/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" "go.uber.org/zap" diff --git a/tests/integration/v2store/main_test.go b/tests/integration/v2store/main_test.go index 6f8926347..654254928 100644 --- a/tests/integration/v2store/main_test.go +++ b/tests/integration/v2store/main_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "go.etcd.io/etcd/v3/integration" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/pkg/testutil" ) diff --git a/tests/integration/v2store/store_tag_v2v3_test.go b/tests/integration/v2store/store_tag_v2v3_test.go index fb404424f..b0c05b0bc 100644 --- a/tests/integration/v2store/store_tag_v2v3_test.go +++ b/tests/integration/v2store/store_tag_v2v3_test.go @@ -20,10 +20,10 @@ import ( "io/ioutil" "testing" + "go.etcd.io/etcd/tests/v3/integration" "go.etcd.io/etcd/v3/clientv3" "go.etcd.io/etcd/v3/etcdserver/api/v2store" "go.etcd.io/etcd/v3/etcdserver/api/v2v3" - "go.etcd.io/etcd/tests/v3/integration" "google.golang.org/grpc/grpclog" )