From 3153038ffbcd6638264e6a9072748549e38c6977 Mon Sep 17 00:00:00 2001 From: Piotr Tabor Date: Sun, 27 Sep 2020 13:52:42 +0200 Subject: [PATCH] tests/integration: Moving integration tests to tests/integration directory git mv integration ./tests git mv client/integration/* ./tests/integration/client git mv clientv3/integration/* ./tests/integration/clientv3 git mv client/example_keys_test.go client/main_test.go tests/integration/client/examples git mv clientv3/concurrency/*_test.go tests/integration/clientv3/concurrency git mv etcdserver/api/v2store/store_v2v3_test.go etcdserver/api/v2v3/*_test.go tests/integration/v2store git mv tests/integration/v2store/store_v2v3_test.go tests/integration/v2store/store_v2v3.go git mv tests/integration/v2store/store_test.go tests/integration/v2store/store_v2v3_test.go git mv etcdserver/api/v2store/store_test.go tests/integration/v2store git mv etcdserver/api/v2store/store_v2_test.go tests/integration/v2store git mv proxy/grpcproxy/*_test.go tests/integration/proxy/grpcproxy git mv ./clientv3/snapshot/testdata ./clientv3/snapshot/*_test.go ./tests/integration/snapshot --- clientv3/naming/grpc_test.go | 2 +- {integration => tests/integration}/bridge.go | 0 .../integration/client}/client_test.go | 0 .../integration => tests/integration/client}/doc.go | 0 .../client/examples}/example_keys_test.go | 0 .../integration/client/examples}/main_test.go | 0 .../integration/client}/main_test.go | 0 .../integration/clientv3}/black_hole_test.go | 0 .../integration/clientv3}/cluster_test.go | 0 .../clientv3}/concurrency/election_test.go | 0 .../clientv3}/concurrency/example_election_test.go | 0 .../clientv3}/concurrency/example_mutex_test.go | 0 .../clientv3}/concurrency/example_stm_test.go | 0 .../integration/clientv3}/concurrency/main_test.go | 0 .../integration/clientv3}/concurrency/mutex_test.go | 0 .../integration/clientv3}/dial_test.go | 0 .../integration/clientv3}/doc.go | 4 ++-- .../integration/clientv3}/kv_test.go | 0 .../integration/clientv3}/lease_test.go | 0 .../integration/clientv3}/leasing_test.go | 0 .../integration/clientv3}/logger_test.go | 0 .../integration/clientv3}/main_test.go | 0 .../integration/clientv3}/maintenance_test.go | 0 .../integration/clientv3}/metrics_test.go | 0 .../integration/clientv3}/mirror_test.go | 0 .../integration/clientv3}/namespace_test.go | 0 .../integration/clientv3}/network_partition_test.go | 0 .../integration/clientv3}/ordering_kv_test.go | 0 .../integration/clientv3}/role_test.go | 0 .../integration/clientv3}/server_shutdown_test.go | 0 .../integration/clientv3}/txn_test.go | 0 .../integration/clientv3}/user_test.go | 0 .../integration/clientv3}/util.go | 0 .../integration/clientv3}/watch_fragment_test.go | 0 .../integration/clientv3}/watch_test.go | 0 {integration => tests/integration}/cluster.go | 0 .../integration}/cluster_direct.go | 0 {integration => tests/integration}/cluster_proxy.go | 0 {integration => tests/integration}/cluster_test.go | 0 {integration => tests/integration}/doc.go | 0 .../integration}/embed/embed_proxy_test.go | 0 .../integration}/embed/embed_test.go | 0 .../integration}/fixtures-expired/README | 0 .../integration}/fixtures-expired/ca-csr.json | 0 .../integration}/fixtures-expired/ca.crt | 0 .../integration}/fixtures-expired/gencert.json | 0 .../integration}/fixtures-expired/gencerts.sh | 0 .../fixtures-expired/server-ca-csr-ip.json | 0 .../fixtures-expired/server-ca-csr.json | 0 .../integration}/fixtures-expired/server-ip.crt | 0 .../fixtures-expired/server-ip.key.insecure | 0 .../integration}/fixtures-expired/server.crt | 0 .../fixtures-expired/server.key.insecure | 0 .../integration}/fixtures/ca-csr.json | 0 {integration => tests/integration}/fixtures/ca.crt | 0 .../integration}/fixtures/client-ca-csr-nocn.json | 0 .../integration}/fixtures/client-nocn.crt | 0 .../integration}/fixtures/client-nocn.key.insecure | 0 .../integration}/fixtures/gencert.json | 0 .../integration}/fixtures/gencerts.sh | 0 .../integration}/fixtures/revoke.crl | Bin .../integration}/fixtures/server-ca-csr-ecdsa.json | 0 .../integration}/fixtures/server-ca-csr-ip.json | 0 .../integration}/fixtures/server-ca-csr-ipv6.json | 0 .../fixtures/server-ca-csr-wildcard.json | 0 .../integration}/fixtures/server-ca-csr.json | 0 .../integration}/fixtures/server-ca-csr2.json | 0 .../integration}/fixtures/server-ca-csr3.json | 0 .../integration}/fixtures/server-ecdsa.crt | 0 .../integration}/fixtures/server-ecdsa.key.insecure | 0 .../integration}/fixtures/server-ip.crt | 0 .../integration}/fixtures/server-ip.key.insecure | 0 .../integration}/fixtures/server-ipv6.crt | 0 .../integration}/fixtures/server-ipv6.key.insecure | 0 .../integration}/fixtures/server-revoked.crt | 0 .../fixtures/server-revoked.key.insecure | 0 .../integration}/fixtures/server-wildcard.crt | 0 .../fixtures/server-wildcard.key.insecure | 0 .../integration}/fixtures/server.crt | 0 .../integration}/fixtures/server.key.insecure | 0 .../integration}/fixtures/server2.crt | 0 .../integration}/fixtures/server2.key.insecure | 0 .../integration}/fixtures/server3.crt | 0 .../integration}/fixtures/server3.key.insecure | 0 {integration => tests/integration}/logger_test.go | 0 {integration => tests/integration}/main_test.go | 0 {integration => tests/integration}/member_test.go | 0 {integration => tests/integration}/metrics_test.go | 0 .../integration}/network_partition_test.go | 0 .../integration/proxy}/grpcproxy/cluster_test.go | 0 .../integration/proxy}/grpcproxy/kv_test.go | 0 .../integration/proxy}/grpcproxy/register_test.go | 0 .../snapshot/testdata/corrupted_backup.db | Bin {integration => tests/integration}/util_test.go | 0 .../integration}/v2_http_kv_test.go | 0 .../v2v3 => tests/integration/v2store}/main_test.go | 2 +- .../integration/v2store/store_tag_not_v2v3_test.go | 0 .../integration/v2store/store_tag_v2v3_test.go | 2 +- .../api => tests/integration}/v2store/store_test.go | 0 .../integration/v2store/store_v2v3_test.go | 2 +- {integration => tests/integration}/v3_alarm_test.go | 0 {integration => tests/integration}/v3_auth_test.go | 0 .../integration}/v3_barrier_test.go | 0 .../integration}/v3_double_barrier_test.go | 0 .../integration}/v3_election_test.go | 0 .../integration}/v3_grpc_inflight_test.go | 0 {integration => tests/integration}/v3_grpc_test.go | 0 .../integration}/v3_health_test.go | 0 .../integration}/v3_leadership_test.go | 0 {integration => tests/integration}/v3_lease_test.go | 0 {integration => tests/integration}/v3_lock_test.go | 0 {integration => tests/integration}/v3_queue_test.go | 0 {integration => tests/integration}/v3_stm_test.go | 0 {integration => tests/integration}/v3_tls_test.go | 0 .../integration}/v3_watch_restore_test.go | 0 {integration => tests/integration}/v3_watch_test.go | 0 .../integration}/v3election_grpc_test.go | 0 .../integration}/v3lock_grpc_test.go | 0 118 files changed, 6 insertions(+), 6 deletions(-) rename {integration => tests/integration}/bridge.go (100%) rename {client/integration => tests/integration/client}/client_test.go (100%) rename {client/integration => tests/integration/client}/doc.go (100%) rename {client => tests/integration/client/examples}/example_keys_test.go (100%) rename {client => tests/integration/client/examples}/main_test.go (100%) rename {client/integration => tests/integration/client}/main_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/black_hole_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/cluster_test.go (100%) rename {clientv3 => tests/integration/clientv3}/concurrency/election_test.go (100%) rename {clientv3 => tests/integration/clientv3}/concurrency/example_election_test.go (100%) rename {clientv3 => tests/integration/clientv3}/concurrency/example_mutex_test.go (100%) rename {clientv3 => tests/integration/clientv3}/concurrency/example_stm_test.go (100%) rename {clientv3 => tests/integration/clientv3}/concurrency/main_test.go (100%) rename {clientv3 => tests/integration/clientv3}/concurrency/mutex_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/dial_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/doc.go (85%) rename {clientv3/integration => tests/integration/clientv3}/kv_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/lease_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/leasing_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/logger_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/main_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/maintenance_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/metrics_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/mirror_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/namespace_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/network_partition_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/ordering_kv_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/role_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/server_shutdown_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/txn_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/user_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/util.go (100%) rename {clientv3/integration => tests/integration/clientv3}/watch_fragment_test.go (100%) rename {clientv3/integration => tests/integration/clientv3}/watch_test.go (100%) rename {integration => tests/integration}/cluster.go (100%) rename {integration => tests/integration}/cluster_direct.go (100%) rename {integration => tests/integration}/cluster_proxy.go (100%) rename {integration => tests/integration}/cluster_test.go (100%) rename {integration => tests/integration}/doc.go (100%) rename {integration => tests/integration}/embed/embed_proxy_test.go (100%) rename {integration => tests/integration}/embed/embed_test.go (100%) rename {integration => tests/integration}/fixtures-expired/README (100%) rename {integration => tests/integration}/fixtures-expired/ca-csr.json (100%) rename {integration => tests/integration}/fixtures-expired/ca.crt (100%) rename {integration => tests/integration}/fixtures-expired/gencert.json (100%) rename {integration => tests/integration}/fixtures-expired/gencerts.sh (100%) rename {integration => tests/integration}/fixtures-expired/server-ca-csr-ip.json (100%) rename {integration => tests/integration}/fixtures-expired/server-ca-csr.json (100%) rename {integration => tests/integration}/fixtures-expired/server-ip.crt (100%) rename {integration => tests/integration}/fixtures-expired/server-ip.key.insecure (100%) rename {integration => tests/integration}/fixtures-expired/server.crt (100%) rename {integration => tests/integration}/fixtures-expired/server.key.insecure (100%) rename {integration => tests/integration}/fixtures/ca-csr.json (100%) rename {integration => tests/integration}/fixtures/ca.crt (100%) rename {integration => tests/integration}/fixtures/client-ca-csr-nocn.json (100%) rename {integration => tests/integration}/fixtures/client-nocn.crt (100%) rename {integration => tests/integration}/fixtures/client-nocn.key.insecure (100%) rename {integration => tests/integration}/fixtures/gencert.json (100%) rename {integration => tests/integration}/fixtures/gencerts.sh (100%) rename {integration => tests/integration}/fixtures/revoke.crl (100%) rename {integration => tests/integration}/fixtures/server-ca-csr-ecdsa.json (100%) rename {integration => tests/integration}/fixtures/server-ca-csr-ip.json (100%) rename {integration => tests/integration}/fixtures/server-ca-csr-ipv6.json (100%) rename {integration => tests/integration}/fixtures/server-ca-csr-wildcard.json (100%) rename {integration => tests/integration}/fixtures/server-ca-csr.json (100%) rename {integration => tests/integration}/fixtures/server-ca-csr2.json (100%) rename {integration => tests/integration}/fixtures/server-ca-csr3.json (100%) rename {integration => tests/integration}/fixtures/server-ecdsa.crt (100%) rename {integration => tests/integration}/fixtures/server-ecdsa.key.insecure (100%) rename {integration => tests/integration}/fixtures/server-ip.crt (100%) rename {integration => tests/integration}/fixtures/server-ip.key.insecure (100%) rename {integration => tests/integration}/fixtures/server-ipv6.crt (100%) rename {integration => tests/integration}/fixtures/server-ipv6.key.insecure (100%) rename {integration => tests/integration}/fixtures/server-revoked.crt (100%) rename {integration => tests/integration}/fixtures/server-revoked.key.insecure (100%) rename {integration => tests/integration}/fixtures/server-wildcard.crt (100%) rename {integration => tests/integration}/fixtures/server-wildcard.key.insecure (100%) rename {integration => tests/integration}/fixtures/server.crt (100%) rename {integration => tests/integration}/fixtures/server.key.insecure (100%) rename {integration => tests/integration}/fixtures/server2.crt (100%) rename {integration => tests/integration}/fixtures/server2.key.insecure (100%) rename {integration => tests/integration}/fixtures/server3.crt (100%) rename {integration => tests/integration}/fixtures/server3.key.insecure (100%) rename {integration => tests/integration}/logger_test.go (100%) rename {integration => tests/integration}/main_test.go (100%) rename {integration => tests/integration}/member_test.go (100%) rename {integration => tests/integration}/metrics_test.go (100%) rename {integration => tests/integration}/network_partition_test.go (100%) rename {proxy => tests/integration/proxy}/grpcproxy/cluster_test.go (100%) rename {proxy => tests/integration/proxy}/grpcproxy/kv_test.go (100%) rename {proxy => tests/integration/proxy}/grpcproxy/register_test.go (100%) rename {clientv3 => tests/integration}/snapshot/testdata/corrupted_backup.db (100%) rename {integration => tests/integration}/util_test.go (100%) rename {integration => tests/integration}/v2_http_kv_test.go (100%) rename {etcdserver/api/v2v3 => tests/integration/v2store}/main_test.go (98%) rename etcdserver/api/v2store/store_v2_test.go => tests/integration/v2store/store_tag_not_v2v3_test.go (100%) rename etcdserver/api/v2store/store_v2v3_test.go => tests/integration/v2store/store_tag_v2v3_test.go (97%) rename {etcdserver/api => tests/integration}/v2store/store_test.go (100%) rename etcdserver/api/v2v3/store_test.go => tests/integration/v2store/store_v2v3_test.go (99%) rename {integration => tests/integration}/v3_alarm_test.go (100%) rename {integration => tests/integration}/v3_auth_test.go (100%) rename {integration => tests/integration}/v3_barrier_test.go (100%) rename {integration => tests/integration}/v3_double_barrier_test.go (100%) rename {integration => tests/integration}/v3_election_test.go (100%) rename {integration => tests/integration}/v3_grpc_inflight_test.go (100%) rename {integration => tests/integration}/v3_grpc_test.go (100%) rename {integration => tests/integration}/v3_health_test.go (100%) rename {integration => tests/integration}/v3_leadership_test.go (100%) rename {integration => tests/integration}/v3_lease_test.go (100%) rename {integration => tests/integration}/v3_lock_test.go (100%) rename {integration => tests/integration}/v3_queue_test.go (100%) rename {integration => tests/integration}/v3_stm_test.go (100%) rename {integration => tests/integration}/v3_tls_test.go (100%) rename {integration => tests/integration}/v3_watch_restore_test.go (100%) rename {integration => tests/integration}/v3_watch_test.go (100%) rename {integration => tests/integration}/v3election_grpc_test.go (100%) rename {integration => tests/integration}/v3lock_grpc_test.go (100%) diff --git a/clientv3/naming/grpc_test.go b/clientv3/naming/grpc_test.go index 2cdb0df55..8986ec3f9 100644 --- a/clientv3/naming/grpc_test.go +++ b/clientv3/naming/grpc_test.go @@ -108,7 +108,7 @@ func TestGRPCResolverMulti(t *testing.T) { t.Fatal(err) } - r := namingv3.GRPCResolver{c} + r := namingv3.GRPCResolver{Client: c} w, err := r.Resolve("foo") if err != nil { diff --git a/integration/bridge.go b/tests/integration/bridge.go similarity index 100% rename from integration/bridge.go rename to tests/integration/bridge.go diff --git a/client/integration/client_test.go b/tests/integration/client/client_test.go similarity index 100% rename from client/integration/client_test.go rename to tests/integration/client/client_test.go diff --git a/client/integration/doc.go b/tests/integration/client/doc.go similarity index 100% rename from client/integration/doc.go rename to tests/integration/client/doc.go diff --git a/client/example_keys_test.go b/tests/integration/client/examples/example_keys_test.go similarity index 100% rename from client/example_keys_test.go rename to tests/integration/client/examples/example_keys_test.go diff --git a/client/main_test.go b/tests/integration/client/examples/main_test.go similarity index 100% rename from client/main_test.go rename to tests/integration/client/examples/main_test.go diff --git a/client/integration/main_test.go b/tests/integration/client/main_test.go similarity index 100% rename from client/integration/main_test.go rename to tests/integration/client/main_test.go diff --git a/clientv3/integration/black_hole_test.go b/tests/integration/clientv3/black_hole_test.go similarity index 100% rename from clientv3/integration/black_hole_test.go rename to tests/integration/clientv3/black_hole_test.go diff --git a/clientv3/integration/cluster_test.go b/tests/integration/clientv3/cluster_test.go similarity index 100% rename from clientv3/integration/cluster_test.go rename to tests/integration/clientv3/cluster_test.go diff --git a/clientv3/concurrency/election_test.go b/tests/integration/clientv3/concurrency/election_test.go similarity index 100% rename from clientv3/concurrency/election_test.go rename to tests/integration/clientv3/concurrency/election_test.go diff --git a/clientv3/concurrency/example_election_test.go b/tests/integration/clientv3/concurrency/example_election_test.go similarity index 100% rename from clientv3/concurrency/example_election_test.go rename to tests/integration/clientv3/concurrency/example_election_test.go diff --git a/clientv3/concurrency/example_mutex_test.go b/tests/integration/clientv3/concurrency/example_mutex_test.go similarity index 100% rename from clientv3/concurrency/example_mutex_test.go rename to tests/integration/clientv3/concurrency/example_mutex_test.go diff --git a/clientv3/concurrency/example_stm_test.go b/tests/integration/clientv3/concurrency/example_stm_test.go similarity index 100% rename from clientv3/concurrency/example_stm_test.go rename to tests/integration/clientv3/concurrency/example_stm_test.go diff --git a/clientv3/concurrency/main_test.go b/tests/integration/clientv3/concurrency/main_test.go similarity index 100% rename from clientv3/concurrency/main_test.go rename to tests/integration/clientv3/concurrency/main_test.go diff --git a/clientv3/concurrency/mutex_test.go b/tests/integration/clientv3/concurrency/mutex_test.go similarity index 100% rename from clientv3/concurrency/mutex_test.go rename to tests/integration/clientv3/concurrency/mutex_test.go diff --git a/clientv3/integration/dial_test.go b/tests/integration/clientv3/dial_test.go similarity index 100% rename from clientv3/integration/dial_test.go rename to tests/integration/clientv3/dial_test.go diff --git a/clientv3/integration/doc.go b/tests/integration/clientv3/doc.go similarity index 85% rename from clientv3/integration/doc.go rename to tests/integration/clientv3/doc.go index 52dbe41c7..3ebfdc958 100644 --- a/clientv3/integration/doc.go +++ b/tests/integration/clientv3/doc.go @@ -12,6 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Package integration implements tests built upon embedded etcd, and focuses on +// Package clientv3test implements tests built upon embedded etcd, and focuses on // correctness of etcd client. -package integration +package clientv3test diff --git a/clientv3/integration/kv_test.go b/tests/integration/clientv3/kv_test.go similarity index 100% rename from clientv3/integration/kv_test.go rename to tests/integration/clientv3/kv_test.go diff --git a/clientv3/integration/lease_test.go b/tests/integration/clientv3/lease_test.go similarity index 100% rename from clientv3/integration/lease_test.go rename to tests/integration/clientv3/lease_test.go diff --git a/clientv3/integration/leasing_test.go b/tests/integration/clientv3/leasing_test.go similarity index 100% rename from clientv3/integration/leasing_test.go rename to tests/integration/clientv3/leasing_test.go diff --git a/clientv3/integration/logger_test.go b/tests/integration/clientv3/logger_test.go similarity index 100% rename from clientv3/integration/logger_test.go rename to tests/integration/clientv3/logger_test.go diff --git a/clientv3/integration/main_test.go b/tests/integration/clientv3/main_test.go similarity index 100% rename from clientv3/integration/main_test.go rename to tests/integration/clientv3/main_test.go diff --git a/clientv3/integration/maintenance_test.go b/tests/integration/clientv3/maintenance_test.go similarity index 100% rename from clientv3/integration/maintenance_test.go rename to tests/integration/clientv3/maintenance_test.go diff --git a/clientv3/integration/metrics_test.go b/tests/integration/clientv3/metrics_test.go similarity index 100% rename from clientv3/integration/metrics_test.go rename to tests/integration/clientv3/metrics_test.go diff --git a/clientv3/integration/mirror_test.go b/tests/integration/clientv3/mirror_test.go similarity index 100% rename from clientv3/integration/mirror_test.go rename to tests/integration/clientv3/mirror_test.go diff --git a/clientv3/integration/namespace_test.go b/tests/integration/clientv3/namespace_test.go similarity index 100% rename from clientv3/integration/namespace_test.go rename to tests/integration/clientv3/namespace_test.go diff --git a/clientv3/integration/network_partition_test.go b/tests/integration/clientv3/network_partition_test.go similarity index 100% rename from clientv3/integration/network_partition_test.go rename to tests/integration/clientv3/network_partition_test.go diff --git a/clientv3/integration/ordering_kv_test.go b/tests/integration/clientv3/ordering_kv_test.go similarity index 100% rename from clientv3/integration/ordering_kv_test.go rename to tests/integration/clientv3/ordering_kv_test.go diff --git a/clientv3/integration/role_test.go b/tests/integration/clientv3/role_test.go similarity index 100% rename from clientv3/integration/role_test.go rename to tests/integration/clientv3/role_test.go diff --git a/clientv3/integration/server_shutdown_test.go b/tests/integration/clientv3/server_shutdown_test.go similarity index 100% rename from clientv3/integration/server_shutdown_test.go rename to tests/integration/clientv3/server_shutdown_test.go diff --git a/clientv3/integration/txn_test.go b/tests/integration/clientv3/txn_test.go similarity index 100% rename from clientv3/integration/txn_test.go rename to tests/integration/clientv3/txn_test.go diff --git a/clientv3/integration/user_test.go b/tests/integration/clientv3/user_test.go similarity index 100% rename from clientv3/integration/user_test.go rename to tests/integration/clientv3/user_test.go diff --git a/clientv3/integration/util.go b/tests/integration/clientv3/util.go similarity index 100% rename from clientv3/integration/util.go rename to tests/integration/clientv3/util.go diff --git a/clientv3/integration/watch_fragment_test.go b/tests/integration/clientv3/watch_fragment_test.go similarity index 100% rename from clientv3/integration/watch_fragment_test.go rename to tests/integration/clientv3/watch_fragment_test.go diff --git a/clientv3/integration/watch_test.go b/tests/integration/clientv3/watch_test.go similarity index 100% rename from clientv3/integration/watch_test.go rename to tests/integration/clientv3/watch_test.go diff --git a/integration/cluster.go b/tests/integration/cluster.go similarity index 100% rename from integration/cluster.go rename to tests/integration/cluster.go diff --git a/integration/cluster_direct.go b/tests/integration/cluster_direct.go similarity index 100% rename from integration/cluster_direct.go rename to tests/integration/cluster_direct.go diff --git a/integration/cluster_proxy.go b/tests/integration/cluster_proxy.go similarity index 100% rename from integration/cluster_proxy.go rename to tests/integration/cluster_proxy.go diff --git a/integration/cluster_test.go b/tests/integration/cluster_test.go similarity index 100% rename from integration/cluster_test.go rename to tests/integration/cluster_test.go diff --git a/integration/doc.go b/tests/integration/doc.go similarity index 100% rename from integration/doc.go rename to tests/integration/doc.go diff --git a/integration/embed/embed_proxy_test.go b/tests/integration/embed/embed_proxy_test.go similarity index 100% rename from integration/embed/embed_proxy_test.go rename to tests/integration/embed/embed_proxy_test.go diff --git a/integration/embed/embed_test.go b/tests/integration/embed/embed_test.go similarity index 100% rename from integration/embed/embed_test.go rename to tests/integration/embed/embed_test.go diff --git a/integration/fixtures-expired/README b/tests/integration/fixtures-expired/README similarity index 100% rename from integration/fixtures-expired/README rename to tests/integration/fixtures-expired/README diff --git a/integration/fixtures-expired/ca-csr.json b/tests/integration/fixtures-expired/ca-csr.json similarity index 100% rename from integration/fixtures-expired/ca-csr.json rename to tests/integration/fixtures-expired/ca-csr.json diff --git a/integration/fixtures-expired/ca.crt b/tests/integration/fixtures-expired/ca.crt similarity index 100% rename from integration/fixtures-expired/ca.crt rename to tests/integration/fixtures-expired/ca.crt diff --git a/integration/fixtures-expired/gencert.json b/tests/integration/fixtures-expired/gencert.json similarity index 100% rename from integration/fixtures-expired/gencert.json rename to tests/integration/fixtures-expired/gencert.json diff --git a/integration/fixtures-expired/gencerts.sh b/tests/integration/fixtures-expired/gencerts.sh similarity index 100% rename from integration/fixtures-expired/gencerts.sh rename to tests/integration/fixtures-expired/gencerts.sh diff --git a/integration/fixtures-expired/server-ca-csr-ip.json b/tests/integration/fixtures-expired/server-ca-csr-ip.json similarity index 100% rename from integration/fixtures-expired/server-ca-csr-ip.json rename to tests/integration/fixtures-expired/server-ca-csr-ip.json diff --git a/integration/fixtures-expired/server-ca-csr.json b/tests/integration/fixtures-expired/server-ca-csr.json similarity index 100% rename from integration/fixtures-expired/server-ca-csr.json rename to tests/integration/fixtures-expired/server-ca-csr.json diff --git a/integration/fixtures-expired/server-ip.crt b/tests/integration/fixtures-expired/server-ip.crt similarity index 100% rename from integration/fixtures-expired/server-ip.crt rename to tests/integration/fixtures-expired/server-ip.crt diff --git a/integration/fixtures-expired/server-ip.key.insecure b/tests/integration/fixtures-expired/server-ip.key.insecure similarity index 100% rename from integration/fixtures-expired/server-ip.key.insecure rename to tests/integration/fixtures-expired/server-ip.key.insecure diff --git a/integration/fixtures-expired/server.crt b/tests/integration/fixtures-expired/server.crt similarity index 100% rename from integration/fixtures-expired/server.crt rename to tests/integration/fixtures-expired/server.crt diff --git a/integration/fixtures-expired/server.key.insecure b/tests/integration/fixtures-expired/server.key.insecure similarity index 100% rename from integration/fixtures-expired/server.key.insecure rename to tests/integration/fixtures-expired/server.key.insecure diff --git a/integration/fixtures/ca-csr.json b/tests/integration/fixtures/ca-csr.json similarity index 100% rename from integration/fixtures/ca-csr.json rename to tests/integration/fixtures/ca-csr.json diff --git a/integration/fixtures/ca.crt b/tests/integration/fixtures/ca.crt similarity index 100% rename from integration/fixtures/ca.crt rename to tests/integration/fixtures/ca.crt diff --git a/integration/fixtures/client-ca-csr-nocn.json b/tests/integration/fixtures/client-ca-csr-nocn.json similarity index 100% rename from integration/fixtures/client-ca-csr-nocn.json rename to tests/integration/fixtures/client-ca-csr-nocn.json diff --git a/integration/fixtures/client-nocn.crt b/tests/integration/fixtures/client-nocn.crt similarity index 100% rename from integration/fixtures/client-nocn.crt rename to tests/integration/fixtures/client-nocn.crt diff --git a/integration/fixtures/client-nocn.key.insecure b/tests/integration/fixtures/client-nocn.key.insecure similarity index 100% rename from integration/fixtures/client-nocn.key.insecure rename to tests/integration/fixtures/client-nocn.key.insecure diff --git a/integration/fixtures/gencert.json b/tests/integration/fixtures/gencert.json similarity index 100% rename from integration/fixtures/gencert.json rename to tests/integration/fixtures/gencert.json diff --git a/integration/fixtures/gencerts.sh b/tests/integration/fixtures/gencerts.sh similarity index 100% rename from integration/fixtures/gencerts.sh rename to tests/integration/fixtures/gencerts.sh diff --git a/integration/fixtures/revoke.crl b/tests/integration/fixtures/revoke.crl similarity index 100% rename from integration/fixtures/revoke.crl rename to tests/integration/fixtures/revoke.crl diff --git a/integration/fixtures/server-ca-csr-ecdsa.json b/tests/integration/fixtures/server-ca-csr-ecdsa.json similarity index 100% rename from integration/fixtures/server-ca-csr-ecdsa.json rename to tests/integration/fixtures/server-ca-csr-ecdsa.json diff --git a/integration/fixtures/server-ca-csr-ip.json b/tests/integration/fixtures/server-ca-csr-ip.json similarity index 100% rename from integration/fixtures/server-ca-csr-ip.json rename to tests/integration/fixtures/server-ca-csr-ip.json diff --git a/integration/fixtures/server-ca-csr-ipv6.json b/tests/integration/fixtures/server-ca-csr-ipv6.json similarity index 100% rename from integration/fixtures/server-ca-csr-ipv6.json rename to tests/integration/fixtures/server-ca-csr-ipv6.json diff --git a/integration/fixtures/server-ca-csr-wildcard.json b/tests/integration/fixtures/server-ca-csr-wildcard.json similarity index 100% rename from integration/fixtures/server-ca-csr-wildcard.json rename to tests/integration/fixtures/server-ca-csr-wildcard.json diff --git a/integration/fixtures/server-ca-csr.json b/tests/integration/fixtures/server-ca-csr.json similarity index 100% rename from integration/fixtures/server-ca-csr.json rename to tests/integration/fixtures/server-ca-csr.json diff --git a/integration/fixtures/server-ca-csr2.json b/tests/integration/fixtures/server-ca-csr2.json similarity index 100% rename from integration/fixtures/server-ca-csr2.json rename to tests/integration/fixtures/server-ca-csr2.json diff --git a/integration/fixtures/server-ca-csr3.json b/tests/integration/fixtures/server-ca-csr3.json similarity index 100% rename from integration/fixtures/server-ca-csr3.json rename to tests/integration/fixtures/server-ca-csr3.json diff --git a/integration/fixtures/server-ecdsa.crt b/tests/integration/fixtures/server-ecdsa.crt similarity index 100% rename from integration/fixtures/server-ecdsa.crt rename to tests/integration/fixtures/server-ecdsa.crt diff --git a/integration/fixtures/server-ecdsa.key.insecure b/tests/integration/fixtures/server-ecdsa.key.insecure similarity index 100% rename from integration/fixtures/server-ecdsa.key.insecure rename to tests/integration/fixtures/server-ecdsa.key.insecure diff --git a/integration/fixtures/server-ip.crt b/tests/integration/fixtures/server-ip.crt similarity index 100% rename from integration/fixtures/server-ip.crt rename to tests/integration/fixtures/server-ip.crt diff --git a/integration/fixtures/server-ip.key.insecure b/tests/integration/fixtures/server-ip.key.insecure similarity index 100% rename from integration/fixtures/server-ip.key.insecure rename to tests/integration/fixtures/server-ip.key.insecure diff --git a/integration/fixtures/server-ipv6.crt b/tests/integration/fixtures/server-ipv6.crt similarity index 100% rename from integration/fixtures/server-ipv6.crt rename to tests/integration/fixtures/server-ipv6.crt diff --git a/integration/fixtures/server-ipv6.key.insecure b/tests/integration/fixtures/server-ipv6.key.insecure similarity index 100% rename from integration/fixtures/server-ipv6.key.insecure rename to tests/integration/fixtures/server-ipv6.key.insecure diff --git a/integration/fixtures/server-revoked.crt b/tests/integration/fixtures/server-revoked.crt similarity index 100% rename from integration/fixtures/server-revoked.crt rename to tests/integration/fixtures/server-revoked.crt diff --git a/integration/fixtures/server-revoked.key.insecure b/tests/integration/fixtures/server-revoked.key.insecure similarity index 100% rename from integration/fixtures/server-revoked.key.insecure rename to tests/integration/fixtures/server-revoked.key.insecure diff --git a/integration/fixtures/server-wildcard.crt b/tests/integration/fixtures/server-wildcard.crt similarity index 100% rename from integration/fixtures/server-wildcard.crt rename to tests/integration/fixtures/server-wildcard.crt diff --git a/integration/fixtures/server-wildcard.key.insecure b/tests/integration/fixtures/server-wildcard.key.insecure similarity index 100% rename from integration/fixtures/server-wildcard.key.insecure rename to tests/integration/fixtures/server-wildcard.key.insecure diff --git a/integration/fixtures/server.crt b/tests/integration/fixtures/server.crt similarity index 100% rename from integration/fixtures/server.crt rename to tests/integration/fixtures/server.crt diff --git a/integration/fixtures/server.key.insecure b/tests/integration/fixtures/server.key.insecure similarity index 100% rename from integration/fixtures/server.key.insecure rename to tests/integration/fixtures/server.key.insecure diff --git a/integration/fixtures/server2.crt b/tests/integration/fixtures/server2.crt similarity index 100% rename from integration/fixtures/server2.crt rename to tests/integration/fixtures/server2.crt diff --git a/integration/fixtures/server2.key.insecure b/tests/integration/fixtures/server2.key.insecure similarity index 100% rename from integration/fixtures/server2.key.insecure rename to tests/integration/fixtures/server2.key.insecure diff --git a/integration/fixtures/server3.crt b/tests/integration/fixtures/server3.crt similarity index 100% rename from integration/fixtures/server3.crt rename to tests/integration/fixtures/server3.crt diff --git a/integration/fixtures/server3.key.insecure b/tests/integration/fixtures/server3.key.insecure similarity index 100% rename from integration/fixtures/server3.key.insecure rename to tests/integration/fixtures/server3.key.insecure diff --git a/integration/logger_test.go b/tests/integration/logger_test.go similarity index 100% rename from integration/logger_test.go rename to tests/integration/logger_test.go diff --git a/integration/main_test.go b/tests/integration/main_test.go similarity index 100% rename from integration/main_test.go rename to tests/integration/main_test.go diff --git a/integration/member_test.go b/tests/integration/member_test.go similarity index 100% rename from integration/member_test.go rename to tests/integration/member_test.go diff --git a/integration/metrics_test.go b/tests/integration/metrics_test.go similarity index 100% rename from integration/metrics_test.go rename to tests/integration/metrics_test.go diff --git a/integration/network_partition_test.go b/tests/integration/network_partition_test.go similarity index 100% rename from integration/network_partition_test.go rename to tests/integration/network_partition_test.go diff --git a/proxy/grpcproxy/cluster_test.go b/tests/integration/proxy/grpcproxy/cluster_test.go similarity index 100% rename from proxy/grpcproxy/cluster_test.go rename to tests/integration/proxy/grpcproxy/cluster_test.go diff --git a/proxy/grpcproxy/kv_test.go b/tests/integration/proxy/grpcproxy/kv_test.go similarity index 100% rename from proxy/grpcproxy/kv_test.go rename to tests/integration/proxy/grpcproxy/kv_test.go diff --git a/proxy/grpcproxy/register_test.go b/tests/integration/proxy/grpcproxy/register_test.go similarity index 100% rename from proxy/grpcproxy/register_test.go rename to tests/integration/proxy/grpcproxy/register_test.go diff --git a/clientv3/snapshot/testdata/corrupted_backup.db b/tests/integration/snapshot/testdata/corrupted_backup.db similarity index 100% rename from clientv3/snapshot/testdata/corrupted_backup.db rename to tests/integration/snapshot/testdata/corrupted_backup.db diff --git a/integration/util_test.go b/tests/integration/util_test.go similarity index 100% rename from integration/util_test.go rename to tests/integration/util_test.go diff --git a/integration/v2_http_kv_test.go b/tests/integration/v2_http_kv_test.go similarity index 100% rename from integration/v2_http_kv_test.go rename to tests/integration/v2_http_kv_test.go diff --git a/etcdserver/api/v2v3/main_test.go b/tests/integration/v2store/main_test.go similarity index 98% rename from etcdserver/api/v2v3/main_test.go rename to tests/integration/v2store/main_test.go index a69cb9c0a..6f8926347 100644 --- a/etcdserver/api/v2v3/main_test.go +++ b/tests/integration/v2store/main_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package v2v3_test +package v2store_test import ( "fmt" diff --git a/etcdserver/api/v2store/store_v2_test.go b/tests/integration/v2store/store_tag_not_v2v3_test.go similarity index 100% rename from etcdserver/api/v2store/store_v2_test.go rename to tests/integration/v2store/store_tag_not_v2v3_test.go diff --git a/etcdserver/api/v2store/store_v2v3_test.go b/tests/integration/v2store/store_tag_v2v3_test.go similarity index 97% rename from etcdserver/api/v2store/store_v2v3_test.go rename to tests/integration/v2store/store_tag_v2v3_test.go index b7d4b26c9..fb404424f 100644 --- a/etcdserver/api/v2store/store_v2v3_test.go +++ b/tests/integration/v2store/store_tag_v2v3_test.go @@ -23,7 +23,7 @@ import ( "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/v3/integration" + "go.etcd.io/etcd/tests/v3/integration" "google.golang.org/grpc/grpclog" ) diff --git a/etcdserver/api/v2store/store_test.go b/tests/integration/v2store/store_test.go similarity index 100% rename from etcdserver/api/v2store/store_test.go rename to tests/integration/v2store/store_test.go diff --git a/etcdserver/api/v2v3/store_test.go b/tests/integration/v2store/store_v2v3_test.go similarity index 99% rename from etcdserver/api/v2v3/store_test.go rename to tests/integration/v2store/store_v2v3_test.go index deb91292e..6d6269360 100644 --- a/etcdserver/api/v2v3/store_test.go +++ b/tests/integration/v2store/store_v2v3_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package v2v3_test +package v2store_test import ( "strings" diff --git a/integration/v3_alarm_test.go b/tests/integration/v3_alarm_test.go similarity index 100% rename from integration/v3_alarm_test.go rename to tests/integration/v3_alarm_test.go diff --git a/integration/v3_auth_test.go b/tests/integration/v3_auth_test.go similarity index 100% rename from integration/v3_auth_test.go rename to tests/integration/v3_auth_test.go diff --git a/integration/v3_barrier_test.go b/tests/integration/v3_barrier_test.go similarity index 100% rename from integration/v3_barrier_test.go rename to tests/integration/v3_barrier_test.go diff --git a/integration/v3_double_barrier_test.go b/tests/integration/v3_double_barrier_test.go similarity index 100% rename from integration/v3_double_barrier_test.go rename to tests/integration/v3_double_barrier_test.go diff --git a/integration/v3_election_test.go b/tests/integration/v3_election_test.go similarity index 100% rename from integration/v3_election_test.go rename to tests/integration/v3_election_test.go diff --git a/integration/v3_grpc_inflight_test.go b/tests/integration/v3_grpc_inflight_test.go similarity index 100% rename from integration/v3_grpc_inflight_test.go rename to tests/integration/v3_grpc_inflight_test.go diff --git a/integration/v3_grpc_test.go b/tests/integration/v3_grpc_test.go similarity index 100% rename from integration/v3_grpc_test.go rename to tests/integration/v3_grpc_test.go diff --git a/integration/v3_health_test.go b/tests/integration/v3_health_test.go similarity index 100% rename from integration/v3_health_test.go rename to tests/integration/v3_health_test.go diff --git a/integration/v3_leadership_test.go b/tests/integration/v3_leadership_test.go similarity index 100% rename from integration/v3_leadership_test.go rename to tests/integration/v3_leadership_test.go diff --git a/integration/v3_lease_test.go b/tests/integration/v3_lease_test.go similarity index 100% rename from integration/v3_lease_test.go rename to tests/integration/v3_lease_test.go diff --git a/integration/v3_lock_test.go b/tests/integration/v3_lock_test.go similarity index 100% rename from integration/v3_lock_test.go rename to tests/integration/v3_lock_test.go diff --git a/integration/v3_queue_test.go b/tests/integration/v3_queue_test.go similarity index 100% rename from integration/v3_queue_test.go rename to tests/integration/v3_queue_test.go diff --git a/integration/v3_stm_test.go b/tests/integration/v3_stm_test.go similarity index 100% rename from integration/v3_stm_test.go rename to tests/integration/v3_stm_test.go diff --git a/integration/v3_tls_test.go b/tests/integration/v3_tls_test.go similarity index 100% rename from integration/v3_tls_test.go rename to tests/integration/v3_tls_test.go diff --git a/integration/v3_watch_restore_test.go b/tests/integration/v3_watch_restore_test.go similarity index 100% rename from integration/v3_watch_restore_test.go rename to tests/integration/v3_watch_restore_test.go diff --git a/integration/v3_watch_test.go b/tests/integration/v3_watch_test.go similarity index 100% rename from integration/v3_watch_test.go rename to tests/integration/v3_watch_test.go diff --git a/integration/v3election_grpc_test.go b/tests/integration/v3election_grpc_test.go similarity index 100% rename from integration/v3election_grpc_test.go rename to tests/integration/v3election_grpc_test.go diff --git a/integration/v3lock_grpc_test.go b/tests/integration/v3lock_grpc_test.go similarity index 100% rename from integration/v3lock_grpc_test.go rename to tests/integration/v3lock_grpc_test.go