From 9abc895122e6f8e3cd50f829a068008996962e67 Mon Sep 17 00:00:00 2001 From: Piotr Tabor Date: Thu, 29 Dec 2022 12:58:55 +0100 Subject: [PATCH] Goimports: Apply automated fixing to test files as well. Signed-off-by: Piotr Tabor --- client/v3/client_test.go | 5 +++-- client/v3/credentials/credentials_test.go | 1 + client/v3/ctx_test.go | 3 ++- pkg/proxy/server_test.go | 4 ++-- scripts/fix.sh | 3 ++- server/auth/range_perm_cache_test.go | 3 ++- server/auth/store_test.go | 5 +++-- server/config/config_test.go | 3 ++- server/embed/config_test.go | 1 + server/etcdmain/config_test.go | 3 ++- server/etcdserver/api/etcdhttp/health_test.go | 3 ++- server/etcdserver/api/etcdhttp/peer_test.go | 1 + server/etcdserver/api/membership/membership_test.go | 1 + server/etcdserver/api/membership/storev2_test.go | 3 ++- server/etcdserver/api/rafthttp/functional_test.go | 3 ++- server/etcdserver/api/rafthttp/http_test.go | 3 ++- server/etcdserver/api/rafthttp/pipeline_test.go | 3 ++- server/etcdserver/api/rafthttp/snapshot_test.go | 3 ++- server/etcdserver/api/rafthttp/stream_test.go | 3 ++- server/etcdserver/api/rafthttp/transport_bench_test.go | 3 ++- server/etcdserver/api/rafthttp/transport_test.go | 3 ++- server/etcdserver/api/snap/snapshotter_test.go | 3 ++- server/etcdserver/api/v2discovery/discovery_test.go | 3 ++- server/etcdserver/api/v2store/store_ttl_test.go | 1 + server/etcdserver/api/v3compactor/periodic_test.go | 6 +++--- server/etcdserver/api/v3compactor/revision_test.go | 3 ++- server/etcdserver/api/v3discovery/discovery_test.go | 6 +++--- server/etcdserver/api/v3rpc/validationfuzz_test.go | 3 ++- server/etcdserver/bootstrap_test.go | 3 ++- server/etcdserver/cindex/cindex_test.go | 3 ++- server/etcdserver/cluster_util_test.go | 6 +++--- server/etcdserver/corrupt_test.go | 3 ++- server/etcdserver/raft_test.go | 3 ++- server/etcdserver/server_test.go | 5 +++-- server/etcdserver/txn/txn_test.go | 3 ++- server/etcdserver/txn/util_bench_test.go | 3 ++- server/etcdserver/version/downgrade_test.go | 3 ++- server/etcdserver/zap_raft_test.go | 3 ++- server/lease/leasehttp/http_test.go | 3 ++- server/lease/lessor_bench_test.go | 3 ++- server/lease/lessor_test.go | 5 +++-- server/storage/mvcc/hash_test.go | 3 ++- server/storage/mvcc/kv_test.go | 3 ++- server/storage/mvcc/kvstore_bench_test.go | 3 ++- server/storage/mvcc/kvstore_compaction_test.go | 3 ++- server/storage/mvcc/kvstore_test.go | 3 ++- server/storage/mvcc/watchable_store_bench_test.go | 3 ++- server/storage/mvcc/watchable_store_test.go | 3 ++- server/storage/mvcc/watcher_bench_test.go | 3 ++- server/storage/mvcc/watcher_test.go | 3 ++- server/storage/schema/actions_test.go | 3 ++- server/storage/schema/confstate_test.go | 3 ++- server/storage/schema/lease_test.go | 3 ++- server/storage/schema/migration_test.go | 3 ++- server/storage/schema/schema_test.go | 3 ++- server/storage/schema/version_test.go | 3 ++- server/storage/wal/repair_test.go | 3 ++- server/storage/wal/version_test.go | 3 ++- server/storage/wal/wal_bench_test.go | 3 ++- server/storage/wal/wal_test.go | 3 ++- server/storage/wal/walpb/record_test.go | 1 + tests/common/auth_test.go | 1 + tests/common/compact_test.go | 1 + tests/common/endpoint_test.go | 1 + tests/common/kv_test.go | 1 + tests/common/lease_test.go | 1 + tests/common/member_test.go | 1 + tests/common/txn_test.go | 1 + tests/common/user_test.go | 1 + tests/common/watch_test.go | 1 + tests/e2e/cluster_downgrade_test.go | 3 ++- tests/e2e/corrupt_test.go | 1 + tests/e2e/ctl_v3_auth_test.go | 1 + tests/e2e/ctl_v3_completion_test.go | 1 + tests/e2e/ctl_v3_elect_test.go | 1 + tests/e2e/ctl_v3_grpc_test.go | 1 + tests/e2e/ctl_v3_kv_test.go | 1 + tests/e2e/ctl_v3_lock_test.go | 1 + tests/e2e/ctl_v3_move_leader_test.go | 1 + tests/e2e/ctl_v3_snapshot_test.go | 1 + tests/e2e/ctl_v3_test.go | 1 + tests/e2e/etcd_config_test.go | 1 + tests/e2e/etcd_grpcproxy_test.go | 1 + tests/e2e/utl_migrate_test.go | 3 ++- tests/e2e/v2store_deprecation_test.go | 3 ++- tests/e2e/v3_cipher_suite_test.go | 1 + tests/e2e/v3_curl_maxstream_test.go | 1 + tests/e2e/v3_curl_test.go | 1 + tests/functional/cmd/etcd-tester/etcd_tester_test.go | 5 +++-- tests/functional/tester/cluster_test.go | 3 ++- tests/integration/clientv3/kv_test.go | 7 ++++--- tests/integration/clientv3/metrics_test.go | 3 ++- tests/integration/clientv3/mirror_auth_test.go | 3 ++- tests/integration/clientv3/ordering_kv_test.go | 1 + tests/integration/clientv3/user_test.go | 3 ++- tests/integration/clientv3/watch_test.go | 3 ++- tests/integration/corrupt_test.go | 1 + tests/integration/grpc_test.go | 3 ++- tests/integration/member_test.go | 1 + tests/integration/proxy/grpcproxy/cluster_test.go | 8 ++++---- tests/integration/proxy/grpcproxy/kv_test.go | 3 ++- tests/integration/proxy/grpcproxy/register_test.go | 3 ++- tests/integration/tracing_test.go | 9 +++++---- tests/integration/utl_wal_version_test.go | 2 +- tests/integration/v3_alarm_test.go | 3 ++- tests/integration/v3_grpc_inflight_test.go | 7 ++++--- tests/integration/v3_leadership_test.go | 3 ++- tests/integration/v3_tls_test.go | 3 ++- tests/linearizability/linearizability_test.go | 3 ++- 109 files changed, 201 insertions(+), 98 deletions(-) diff --git a/client/v3/client_test.go b/client/v3/client_test.go index d8a4b07fe..0f52ad5d3 100644 --- a/client/v3/client_test.go +++ b/client/v3/client_test.go @@ -26,11 +26,12 @@ import ( "github.com/stretchr/testify/assert" + "go.uber.org/zap" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/client/pkg/v3/testutil" - "go.uber.org/zap" - "go.uber.org/zap/zaptest" "google.golang.org/grpc" ) diff --git a/client/v3/credentials/credentials_test.go b/client/v3/credentials/credentials_test.go index c284ca9c7..5111a2ad5 100644 --- a/client/v3/credentials/credentials_test.go +++ b/client/v3/credentials/credentials_test.go @@ -19,6 +19,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" ) diff --git a/client/v3/ctx_test.go b/client/v3/ctx_test.go index 8ba616b76..097b6a3e6 100644 --- a/client/v3/ctx_test.go +++ b/client/v3/ctx_test.go @@ -19,9 +19,10 @@ import ( "reflect" "testing" + "google.golang.org/grpc/metadata" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/version" - "google.golang.org/grpc/metadata" ) func TestMetadataWithRequireLeader(t *testing.T) { diff --git a/pkg/proxy/server_test.go b/pkg/proxy/server_test.go index 999c4304a..6690c619d 100644 --- a/pkg/proxy/server_test.go +++ b/pkg/proxy/server_test.go @@ -31,10 +31,10 @@ import ( "time" "github.com/stretchr/testify/assert" - "go.etcd.io/etcd/client/pkg/v3/transport" + "go.uber.org/zap" "go.uber.org/zap/zaptest" - "go.uber.org/zap" + "go.etcd.io/etcd/client/pkg/v3/transport" ) func TestServer_Unix_Insecure(t *testing.T) { testServer(t, "unix", false, false) } diff --git a/scripts/fix.sh b/scripts/fix.sh index eed895f71..d0fc89262 100755 --- a/scripts/fix.sh +++ b/scripts/fix.sh @@ -33,8 +33,9 @@ function bash_ws_fix { function go_imports_fix { GOFILES=$(run ${GO_CMD} list --f "{{with \$d:=.}}{{range .GoFiles}}{{\$d.Dir}}/{{.}}{{\"\n\"}}{{end}}{{end}}" ./...) + TESTGOFILES=$(run ${GO_CMD} list --f "{{with \$d:=.}}{{range .TestGoFiles}}{{\$d.Dir}}/{{.}}{{\"\n\"}}{{end}}{{end}}" ./...) cd "${ROOTDIR}/tools/mod" - echo "${GOFILES}" | grep -v '.gw.go' | grep -v '.pb.go' | xargs -n 100 go run golang.org/x/tools/cmd/goimports -w -local go.etcd.io + echo "${GOFILES}" "${TESTGOFILES}" | grep -v '.gw.go' | grep -v '.pb.go' | xargs -n 100 go run golang.org/x/tools/cmd/goimports -w -local go.etcd.io } log_callout -e "\\nFixing etcd code for you...\n" diff --git a/server/auth/range_perm_cache_test.go b/server/auth/range_perm_cache_test.go index f4002c589..ef26f5584 100644 --- a/server/auth/range_perm_cache_test.go +++ b/server/auth/range_perm_cache_test.go @@ -17,9 +17,10 @@ package auth import ( "testing" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/api/v3/authpb" "go.etcd.io/etcd/pkg/v3/adt" - "go.uber.org/zap/zaptest" ) func TestRangePermission(t *testing.T) { diff --git a/server/auth/store_test.go b/server/auth/store_test.go index 79bae8d67..0287c2e53 100644 --- a/server/auth/store_test.go +++ b/server/auth/store_test.go @@ -26,12 +26,13 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap/zaptest" + "golang.org/x/crypto/bcrypt" + "google.golang.org/grpc/metadata" + "go.etcd.io/etcd/api/v3/authpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/pkg/v3/adt" - "golang.org/x/crypto/bcrypt" - "google.golang.org/grpc/metadata" ) func dummyIndexWaiter(index uint64) <-chan struct{} { diff --git a/server/config/config_test.go b/server/config/config_test.go index 8283f7d13..069dc9e13 100644 --- a/server/config/config_test.go +++ b/server/config/config_test.go @@ -18,8 +18,9 @@ import ( "net/url" "testing" - "go.etcd.io/etcd/client/pkg/v3/types" "go.uber.org/zap/zaptest" + + "go.etcd.io/etcd/client/pkg/v3/types" ) func mustNewURLs(t *testing.T, urls []string) []url.URL { diff --git a/server/embed/config_test.go b/server/embed/config_test.go index bb5c08880..06e465c5f 100644 --- a/server/embed/config_test.go +++ b/server/embed/config_test.go @@ -24,6 +24,7 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.etcd.io/etcd/client/pkg/v3/srv" "go.etcd.io/etcd/client/pkg/v3/transport" "go.etcd.io/etcd/client/pkg/v3/types" diff --git a/server/etcdmain/config_test.go b/server/etcdmain/config_test.go index f06fc4cb6..f0ede206e 100644 --- a/server/etcdmain/config_test.go +++ b/server/etcdmain/config_test.go @@ -22,8 +22,9 @@ import ( "strings" "testing" - "go.etcd.io/etcd/server/v3/embed" "sigs.k8s.io/yaml" + + "go.etcd.io/etcd/server/v3/embed" ) func TestConfigParsingMemberFlags(t *testing.T) { diff --git a/server/etcdserver/api/etcdhttp/health_test.go b/server/etcdserver/api/etcdhttp/health_test.go index 6dfbd1b19..29172b5ee 100644 --- a/server/etcdserver/api/etcdhttp/health_test.go +++ b/server/etcdserver/api/etcdhttp/health_test.go @@ -23,6 +23,8 @@ import ( "net/http/httptest" "testing" + "go.uber.org/zap/zaptest" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/types" @@ -30,7 +32,6 @@ import ( "go.etcd.io/etcd/server/v3/config" "go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/raft/v3" - "go.uber.org/zap/zaptest" ) type fakeStats struct{} diff --git a/server/etcdserver/api/etcdhttp/peer_test.go b/server/etcdserver/api/etcdhttp/peer_test.go index 259cc4edb..1a2380a00 100644 --- a/server/etcdserver/api/etcdhttp/peer_test.go +++ b/server/etcdserver/api/etcdhttp/peer_test.go @@ -29,6 +29,7 @@ import ( "go.uber.org/zap/zaptest" "github.com/coreos/go-semver/semver" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/types" diff --git a/server/etcdserver/api/membership/membership_test.go b/server/etcdserver/api/membership/membership_test.go index 8a3fe8dbb..728121e1c 100644 --- a/server/etcdserver/api/membership/membership_test.go +++ b/server/etcdserver/api/membership/membership_test.go @@ -19,6 +19,7 @@ import ( "github.com/coreos/go-semver/semver" "github.com/stretchr/testify/assert" + "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/server/v3/etcdserver/version" diff --git a/server/etcdserver/api/membership/storev2_test.go b/server/etcdserver/api/membership/storev2_test.go index 29eb5a7d5..4f849f416 100644 --- a/server/etcdserver/api/membership/storev2_test.go +++ b/server/etcdserver/api/membership/storev2_test.go @@ -19,8 +19,9 @@ import ( "github.com/coreos/go-semver/semver" "github.com/stretchr/testify/assert" - "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" "go.uber.org/zap/zaptest" + + "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" ) func TestIsMetaStoreOnly(t *testing.T) { diff --git a/server/etcdserver/api/rafthttp/functional_test.go b/server/etcdserver/api/rafthttp/functional_test.go index 55e5f6e02..cf507d277 100644 --- a/server/etcdserver/api/rafthttp/functional_test.go +++ b/server/etcdserver/api/rafthttp/functional_test.go @@ -21,11 +21,12 @@ import ( "testing" "time" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/client/pkg/v3/types" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "go.etcd.io/raft/v3" "go.etcd.io/raft/v3/raftpb" - "go.uber.org/zap/zaptest" ) func TestSendMessage(t *testing.T) { diff --git a/server/etcdserver/api/rafthttp/http_test.go b/server/etcdserver/api/rafthttp/http_test.go index 699cb507d..8728fce13 100644 --- a/server/etcdserver/api/rafthttp/http_test.go +++ b/server/etcdserver/api/rafthttp/http_test.go @@ -26,12 +26,13 @@ import ( "testing" "time" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/raft/v3/raftpb" - "go.uber.org/zap/zaptest" ) func TestServeRaftPrefix(t *testing.T) { diff --git a/server/etcdserver/api/rafthttp/pipeline_test.go b/server/etcdserver/api/rafthttp/pipeline_test.go index d1fa1b3a9..325abb97b 100644 --- a/server/etcdserver/api/rafthttp/pipeline_test.go +++ b/server/etcdserver/api/rafthttp/pipeline_test.go @@ -23,12 +23,13 @@ import ( "testing" "time" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/types" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "go.etcd.io/raft/v3/raftpb" - "go.uber.org/zap/zaptest" ) // TestPipelineSend tests that pipeline could send data using roundtripper diff --git a/server/etcdserver/api/rafthttp/snapshot_test.go b/server/etcdserver/api/rafthttp/snapshot_test.go index cc9cb5be8..8f319fe52 100644 --- a/server/etcdserver/api/rafthttp/snapshot_test.go +++ b/server/etcdserver/api/rafthttp/snapshot_test.go @@ -24,10 +24,11 @@ import ( "testing" "time" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/raft/v3/raftpb" - "go.uber.org/zap/zaptest" ) type strReaderCloser struct{ *strings.Reader } diff --git a/server/etcdserver/api/rafthttp/stream_test.go b/server/etcdserver/api/rafthttp/stream_test.go index ffe551c8d..0b0c6f2fd 100644 --- a/server/etcdserver/api/rafthttp/stream_test.go +++ b/server/etcdserver/api/rafthttp/stream_test.go @@ -25,12 +25,13 @@ import ( "testing" "time" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/types" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "go.etcd.io/raft/v3/raftpb" - "go.uber.org/zap/zaptest" "github.com/coreos/go-semver/semver" "golang.org/x/time/rate" diff --git a/server/etcdserver/api/rafthttp/transport_bench_test.go b/server/etcdserver/api/rafthttp/transport_bench_test.go index 6d1e6d7e7..646fa8ee2 100644 --- a/server/etcdserver/api/rafthttp/transport_bench_test.go +++ b/server/etcdserver/api/rafthttp/transport_bench_test.go @@ -21,11 +21,12 @@ import ( "testing" "time" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/client/pkg/v3/types" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "go.etcd.io/raft/v3" "go.etcd.io/raft/v3/raftpb" - "go.uber.org/zap/zaptest" ) func BenchmarkSendingMsgApp(b *testing.B) { diff --git a/server/etcdserver/api/rafthttp/transport_test.go b/server/etcdserver/api/rafthttp/transport_test.go index 05ab30203..474827936 100644 --- a/server/etcdserver/api/rafthttp/transport_test.go +++ b/server/etcdserver/api/rafthttp/transport_test.go @@ -20,11 +20,12 @@ import ( "testing" "time" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/client/pkg/v3/types" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" "go.etcd.io/raft/v3/raftpb" - "go.uber.org/zap/zaptest" "github.com/xiang90/probing" ) diff --git a/server/etcdserver/api/snap/snapshotter_test.go b/server/etcdserver/api/snap/snapshotter_test.go index 54721624d..6074d4c47 100644 --- a/server/etcdserver/api/snap/snapshotter_test.go +++ b/server/etcdserver/api/snap/snapshotter_test.go @@ -22,10 +22,11 @@ import ( "reflect" "testing" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.etcd.io/raft/v3/raftpb" - "go.uber.org/zap/zaptest" ) var testSnap = &raftpb.Snapshot{ diff --git a/server/etcdserver/api/v2discovery/discovery_test.go b/server/etcdserver/api/v2discovery/discovery_test.go index afcb9f78f..7d42eb14e 100644 --- a/server/etcdserver/api/v2discovery/discovery_test.go +++ b/server/etcdserver/api/v2discovery/discovery_test.go @@ -27,9 +27,10 @@ import ( "testing" "time" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/client/v2" - "go.uber.org/zap/zaptest" "github.com/jonboulle/clockwork" ) diff --git a/server/etcdserver/api/v2store/store_ttl_test.go b/server/etcdserver/api/v2store/store_ttl_test.go index 6f21dbb1a..7da08f229 100644 --- a/server/etcdserver/api/v2store/store_ttl_test.go +++ b/server/etcdserver/api/v2store/store_ttl_test.go @@ -19,6 +19,7 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/server/v3/etcdserver/api/v2error" diff --git a/server/etcdserver/api/v3compactor/periodic_test.go b/server/etcdserver/api/v3compactor/periodic_test.go index 5838826d4..1da7f4c4d 100644 --- a/server/etcdserver/api/v3compactor/periodic_test.go +++ b/server/etcdserver/api/v3compactor/periodic_test.go @@ -20,11 +20,11 @@ import ( "testing" "time" - pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/client/pkg/v3/testutil" + "github.com/jonboulle/clockwork" "go.uber.org/zap/zaptest" - "github.com/jonboulle/clockwork" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/client/pkg/v3/testutil" ) func TestPeriodicHourly(t *testing.T) { diff --git a/server/etcdserver/api/v3compactor/revision_test.go b/server/etcdserver/api/v3compactor/revision_test.go index 58472e1ec..e66cfc085 100644 --- a/server/etcdserver/api/v3compactor/revision_test.go +++ b/server/etcdserver/api/v3compactor/revision_test.go @@ -19,9 +19,10 @@ import ( "testing" "time" + "go.uber.org/zap/zaptest" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/client/pkg/v3/testutil" - "go.uber.org/zap/zaptest" "github.com/jonboulle/clockwork" ) diff --git a/server/etcdserver/api/v3discovery/discovery_test.go b/server/etcdserver/api/v3discovery/discovery_test.go index b220dd09a..79df73784 100644 --- a/server/etcdserver/api/v3discovery/discovery_test.go +++ b/server/etcdserver/api/v3discovery/discovery_test.go @@ -20,13 +20,13 @@ import ( "fmt" "testing" + "github.com/jonboulle/clockwork" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/client/pkg/v3/types" clientv3 "go.etcd.io/etcd/client/v3" - "go.uber.org/zap/zaptest" - - "github.com/jonboulle/clockwork" ) // fakeKVForClusterSize is used to test getClusterSize. diff --git a/server/etcdserver/api/v3rpc/validationfuzz_test.go b/server/etcdserver/api/v3rpc/validationfuzz_test.go index c31753de6..d921c9602 100644 --- a/server/etcdserver/api/v3rpc/validationfuzz_test.go +++ b/server/etcdserver/api/v3rpc/validationfuzz_test.go @@ -18,12 +18,13 @@ import ( "context" "testing" + "go.uber.org/zap/zaptest" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" txn "go.etcd.io/etcd/server/v3/etcdserver/txn" "go.etcd.io/etcd/server/v3/lease" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.etcd.io/etcd/server/v3/storage/mvcc" - "go.uber.org/zap/zaptest" ) func FuzzTxnRangeRequest(f *testing.F) { diff --git a/server/etcdserver/bootstrap_test.go b/server/etcdserver/bootstrap_test.go index d3a241385..55a20684f 100644 --- a/server/etcdserver/bootstrap_test.go +++ b/server/etcdserver/bootstrap_test.go @@ -27,12 +27,13 @@ import ( "strings" "testing" + "go.uber.org/zap/zaptest" + bolt "go.etcd.io/bbolt" "go.etcd.io/etcd/server/v3/storage/datadir" "go.etcd.io/etcd/server/v3/storage/schema" "go.etcd.io/etcd/server/v3/storage/wal" "go.etcd.io/etcd/server/v3/storage/wal/walpb" - "go.uber.org/zap/zaptest" "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/version" diff --git a/server/etcdserver/cindex/cindex_test.go b/server/etcdserver/cindex/cindex_test.go index 26269e944..a056ac3d7 100644 --- a/server/etcdserver/cindex/cindex_test.go +++ b/server/etcdserver/cindex/cindex_test.go @@ -20,11 +20,12 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/server/v3/storage/backend" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.etcd.io/etcd/server/v3/storage/schema" - "go.uber.org/zap/zaptest" ) // TestConsistentIndex ensures that LoadConsistentIndex/Save/ConsistentIndex and backend.BatchTx can work well together. diff --git a/server/etcdserver/cluster_util_test.go b/server/etcdserver/cluster_util_test.go index 254829470..d3f653644 100644 --- a/server/etcdserver/cluster_util_test.go +++ b/server/etcdserver/cluster_util_test.go @@ -17,11 +17,11 @@ package etcdserver import ( "testing" - "go.etcd.io/etcd/api/v3/version" - "go.etcd.io/etcd/client/pkg/v3/types" + "github.com/coreos/go-semver/semver" "go.uber.org/zap/zaptest" - "github.com/coreos/go-semver/semver" + "go.etcd.io/etcd/api/v3/version" + "go.etcd.io/etcd/client/pkg/v3/types" ) func TestIsCompatibleWithVers(t *testing.T) { diff --git a/server/etcdserver/corrupt_test.go b/server/etcdserver/corrupt_test.go index 3de73aabe..3fff8a533 100644 --- a/server/etcdserver/corrupt_test.go +++ b/server/etcdserver/corrupt_test.go @@ -21,11 +21,12 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.uber.org/zap/zaptest" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/server/v3/storage/mvcc" - "go.uber.org/zap/zaptest" ) func TestInitialCheck(t *testing.T) { diff --git a/server/etcdserver/raft_test.go b/server/etcdserver/raft_test.go index 7c017ccc2..e795732cb 100644 --- a/server/etcdserver/raft_test.go +++ b/server/etcdserver/raft_test.go @@ -22,6 +22,8 @@ import ( "testing" "time" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/server/v3/etcdserver/api/membership" @@ -29,7 +31,6 @@ import ( serverstorage "go.etcd.io/etcd/server/v3/storage" "go.etcd.io/raft/v3" "go.etcd.io/raft/v3/raftpb" - "go.uber.org/zap/zaptest" ) func TestGetIDs(t *testing.T) { diff --git a/server/etcdserver/server_test.go b/server/etcdserver/server_test.go index 8d740dcbb..2bf113505 100644 --- a/server/etcdserver/server_test.go +++ b/server/etcdserver/server_test.go @@ -29,6 +29,9 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.uber.org/zap" + "go.uber.org/zap/zaptest" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/membershippb" "go.etcd.io/etcd/client/pkg/v3/fileutil" @@ -57,8 +60,6 @@ import ( "go.etcd.io/etcd/server/v3/storage/schema" "go.etcd.io/raft/v3" "go.etcd.io/raft/v3/raftpb" - "go.uber.org/zap" - "go.uber.org/zap/zaptest" ) // TestDoLocalAction tests requests which do not need to go through raft to be applied, diff --git a/server/etcdserver/txn/txn_test.go b/server/etcdserver/txn/txn_test.go index 04d5cc900..673d363d6 100644 --- a/server/etcdserver/txn/txn_test.go +++ b/server/etcdserver/txn/txn_test.go @@ -19,11 +19,12 @@ import ( "strings" "testing" + "go.uber.org/zap/zaptest" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/server/v3/lease" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.etcd.io/etcd/server/v3/storage/mvcc" - "go.uber.org/zap/zaptest" "github.com/stretchr/testify/assert" ) diff --git a/server/etcdserver/txn/util_bench_test.go b/server/etcdserver/txn/util_bench_test.go index b156590cb..5a84f62f5 100644 --- a/server/etcdserver/txn/util_bench_test.go +++ b/server/etcdserver/txn/util_bench_test.go @@ -19,8 +19,9 @@ import ( "testing" "time" - "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap/zaptest" + + "go.etcd.io/raft/v3/raftpb" ) func BenchmarkWarnOfExpensiveRequestNoLog(b *testing.B) { diff --git a/server/etcdserver/version/downgrade_test.go b/server/etcdserver/version/downgrade_test.go index a16a1bafc..95dfcba37 100644 --- a/server/etcdserver/version/downgrade_test.go +++ b/server/etcdserver/version/downgrade_test.go @@ -19,9 +19,10 @@ import ( "testing" "github.com/coreos/go-semver/semver" - "go.etcd.io/etcd/api/v3/version" "go.uber.org/zap" "go.uber.org/zap/zaptest" + + "go.etcd.io/etcd/api/v3/version" ) func TestMustDetectDowngrade(t *testing.T) { diff --git a/server/etcdserver/zap_raft_test.go b/server/etcdserver/zap_raft_test.go index 564140575..0952ac8c2 100644 --- a/server/etcdserver/zap_raft_test.go +++ b/server/etcdserver/zap_raft_test.go @@ -23,9 +23,10 @@ import ( "testing" "time" - "go.etcd.io/etcd/client/pkg/v3/logutil" "go.uber.org/zap" "go.uber.org/zap/zapcore" + + "go.etcd.io/etcd/client/pkg/v3/logutil" ) func TestNewRaftLogger(t *testing.T) { diff --git a/server/lease/leasehttp/http_test.go b/server/lease/leasehttp/http_test.go index e614b4033..7fb284ff4 100644 --- a/server/lease/leasehttp/http_test.go +++ b/server/lease/leasehttp/http_test.go @@ -21,9 +21,10 @@ import ( "testing" "time" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/server/v3/lease" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" - "go.uber.org/zap/zaptest" ) func TestRenewHTTP(t *testing.T) { diff --git a/server/lease/lessor_bench_test.go b/server/lease/lessor_bench_test.go index 19f7aa6ff..71e970e5f 100644 --- a/server/lease/lessor_bench_test.go +++ b/server/lease/lessor_bench_test.go @@ -19,8 +19,9 @@ import ( "testing" "time" - betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.uber.org/zap" + + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" ) func BenchmarkLessorGrant1000(b *testing.B) { benchmarkLessorGrant(1000, b) } diff --git a/server/lease/lessor_test.go b/server/lease/lessor_test.go index 1ee20c8da..ae9ad52e8 100644 --- a/server/lease/lessor_test.go +++ b/server/lease/lessor_test.go @@ -26,12 +26,13 @@ import ( "time" "github.com/coreos/go-semver/semver" + "go.uber.org/zap" + "go.uber.org/zap/zaptest" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/server/v3/storage/backend" "go.etcd.io/etcd/server/v3/storage/schema" - "go.uber.org/zap" - "go.uber.org/zap/zaptest" ) const ( diff --git a/server/storage/mvcc/hash_test.go b/server/storage/mvcc/hash_test.go index 5b401c785..2c7a35f9a 100644 --- a/server/storage/mvcc/hash_test.go +++ b/server/storage/mvcc/hash_test.go @@ -20,11 +20,12 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/server/v3/lease" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.etcd.io/etcd/server/v3/storage/mvcc/testutil" - "go.uber.org/zap/zaptest" ) // TestHashByRevValue test HashByRevValue values to ensure we don't change the diff --git a/server/storage/mvcc/kv_test.go b/server/storage/mvcc/kv_test.go index 1199f3dee..bc2081b02 100644 --- a/server/storage/mvcc/kv_test.go +++ b/server/storage/mvcc/kv_test.go @@ -22,13 +22,14 @@ import ( "testing" "time" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/server/v3/lease" "go.etcd.io/etcd/server/v3/storage/backend" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" - "go.uber.org/zap/zaptest" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" diff --git a/server/storage/mvcc/kvstore_bench_test.go b/server/storage/mvcc/kvstore_bench_test.go index b7bf1bf69..8b9a1456a 100644 --- a/server/storage/mvcc/kvstore_bench_test.go +++ b/server/storage/mvcc/kvstore_bench_test.go @@ -19,12 +19,13 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/server/v3/etcdserver/cindex" "go.etcd.io/etcd/server/v3/lease" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.etcd.io/etcd/server/v3/storage/schema" - "go.uber.org/zap/zaptest" ) func BenchmarkStorePut(b *testing.B) { diff --git a/server/storage/mvcc/kvstore_compaction_test.go b/server/storage/mvcc/kvstore_compaction_test.go index cdb7f96c4..2f8fac83c 100644 --- a/server/storage/mvcc/kvstore_compaction_test.go +++ b/server/storage/mvcc/kvstore_compaction_test.go @@ -21,11 +21,12 @@ import ( "testing" "time" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/server/v3/lease" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.etcd.io/etcd/server/v3/storage/schema" - "go.uber.org/zap/zaptest" ) func TestScheduleCompaction(t *testing.T) { diff --git a/server/storage/mvcc/kvstore_test.go b/server/storage/mvcc/kvstore_test.go index 4c348b07f..8a8bd5bee 100644 --- a/server/storage/mvcc/kvstore_test.go +++ b/server/storage/mvcc/kvstore_test.go @@ -30,6 +30,8 @@ import ( "testing" "time" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/schedule" @@ -38,7 +40,6 @@ import ( "go.etcd.io/etcd/server/v3/storage/backend" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.etcd.io/etcd/server/v3/storage/schema" - "go.uber.org/zap/zaptest" "go.uber.org/zap" ) diff --git a/server/storage/mvcc/watchable_store_bench_test.go b/server/storage/mvcc/watchable_store_bench_test.go index 7796e1d8b..9329dce76 100644 --- a/server/storage/mvcc/watchable_store_bench_test.go +++ b/server/storage/mvcc/watchable_store_bench_test.go @@ -19,10 +19,11 @@ import ( "os" "testing" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/server/v3/lease" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" - "go.uber.org/zap/zaptest" ) func BenchmarkWatchableStorePut(b *testing.B) { diff --git a/server/storage/mvcc/watchable_store_test.go b/server/storage/mvcc/watchable_store_test.go index c892ae50e..a36c3ee14 100644 --- a/server/storage/mvcc/watchable_store_test.go +++ b/server/storage/mvcc/watchable_store_test.go @@ -23,11 +23,12 @@ import ( "testing" "time" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/pkg/v3/traceutil" "go.etcd.io/etcd/server/v3/lease" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" - "go.uber.org/zap/zaptest" ) func TestWatch(t *testing.T) { diff --git a/server/storage/mvcc/watcher_bench_test.go b/server/storage/mvcc/watcher_bench_test.go index 5901ce55e..264369d75 100644 --- a/server/storage/mvcc/watcher_bench_test.go +++ b/server/storage/mvcc/watcher_bench_test.go @@ -18,9 +18,10 @@ import ( "fmt" "testing" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/server/v3/lease" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" - "go.uber.org/zap/zaptest" ) func BenchmarkKVWatcherMemoryUsage(b *testing.B) { diff --git a/server/storage/mvcc/watcher_test.go b/server/storage/mvcc/watcher_test.go index c0719d31f..cbe394022 100644 --- a/server/storage/mvcc/watcher_test.go +++ b/server/storage/mvcc/watcher_test.go @@ -22,10 +22,11 @@ import ( "testing" "time" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/server/v3/lease" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" - "go.uber.org/zap/zaptest" ) // TestWatcherWatchID tests that each watcher provides unique watchID, diff --git a/server/storage/schema/actions_test.go b/server/storage/schema/actions_test.go index ee43d69f4..5a3ef28fd 100644 --- a/server/storage/schema/actions_test.go +++ b/server/storage/schema/actions_test.go @@ -20,9 +20,10 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/server/v3/storage/backend" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" - "go.uber.org/zap/zaptest" ) func TestActionIsReversible(t *testing.T) { diff --git a/server/storage/schema/confstate_test.go b/server/storage/schema/confstate_test.go index 653bf59c5..c82a4487e 100644 --- a/server/storage/schema/confstate_test.go +++ b/server/storage/schema/confstate_test.go @@ -18,9 +18,10 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.uber.org/zap/zaptest" + betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" "go.etcd.io/raft/v3/raftpb" - "go.uber.org/zap/zaptest" ) func TestConfStateFromBackendInOneTx(t *testing.T) { diff --git a/server/storage/schema/lease_test.go b/server/storage/schema/lease_test.go index 6ec943a9a..a06b1769e 100644 --- a/server/storage/schema/lease_test.go +++ b/server/storage/schema/lease_test.go @@ -20,10 +20,11 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/server/v3/lease/leasepb" "go.etcd.io/etcd/server/v3/storage/backend" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" - "go.uber.org/zap/zaptest" ) func TestLeaseBackend(t *testing.T) { diff --git a/server/storage/schema/migration_test.go b/server/storage/schema/migration_test.go index b1a510448..128def4fc 100644 --- a/server/storage/schema/migration_test.go +++ b/server/storage/schema/migration_test.go @@ -21,10 +21,11 @@ import ( "github.com/coreos/go-semver/semver" "github.com/stretchr/testify/assert" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/server/v3/storage/backend" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" - "go.uber.org/zap/zaptest" ) func TestNewPlan(t *testing.T) { diff --git a/server/storage/schema/schema_test.go b/server/storage/schema/schema_test.go index 87d359fa1..6b0024ba7 100644 --- a/server/storage/schema/schema_test.go +++ b/server/storage/schema/schema_test.go @@ -20,6 +20,8 @@ import ( "github.com/coreos/go-semver/semver" "github.com/stretchr/testify/assert" + "go.uber.org/zap" + "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/membershippb" "go.etcd.io/etcd/api/v3/version" @@ -28,7 +30,6 @@ import ( "go.etcd.io/etcd/server/v3/storage/wal" waltesting "go.etcd.io/etcd/server/v3/storage/wal/testing" "go.etcd.io/raft/v3/raftpb" - "go.uber.org/zap" ) func TestValidate(t *testing.T) { diff --git a/server/storage/schema/version_test.go b/server/storage/schema/version_test.go index 67516287b..2a78d88a6 100644 --- a/server/storage/schema/version_test.go +++ b/server/storage/schema/version_test.go @@ -20,9 +20,10 @@ import ( "github.com/coreos/go-semver/semver" "github.com/stretchr/testify/assert" - "go.etcd.io/bbolt" "go.uber.org/zap/zaptest" + "go.etcd.io/bbolt" + "go.etcd.io/etcd/server/v3/storage/backend" betesting "go.etcd.io/etcd/server/v3/storage/backend/testing" ) diff --git a/server/storage/wal/repair_test.go b/server/storage/wal/repair_test.go index 2da9142db..864b56da6 100644 --- a/server/storage/wal/repair_test.go +++ b/server/storage/wal/repair_test.go @@ -20,9 +20,10 @@ import ( "os" "testing" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.etcd.io/raft/v3/raftpb" - "go.uber.org/zap/zaptest" ) type corruptFunc func(string, int64) error diff --git a/server/storage/wal/version_test.go b/server/storage/wal/version_test.go index 904d8a48d..8b5420e94 100644 --- a/server/storage/wal/version_test.go +++ b/server/storage/wal/version_test.go @@ -21,12 +21,13 @@ import ( "github.com/coreos/go-semver/semver" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" + "google.golang.org/protobuf/reflect/protoreflect" + "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/membershippb" "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/raft/v3/raftpb" - "google.golang.org/protobuf/reflect/protoreflect" ) func TestEtcdVersionFromEntry(t *testing.T) { diff --git a/server/storage/wal/wal_bench_test.go b/server/storage/wal/wal_bench_test.go index 0efba051f..c8996dc12 100644 --- a/server/storage/wal/wal_bench_test.go +++ b/server/storage/wal/wal_bench_test.go @@ -17,8 +17,9 @@ package wal import ( "testing" - "go.etcd.io/raft/v3/raftpb" "go.uber.org/zap/zaptest" + + "go.etcd.io/raft/v3/raftpb" ) func BenchmarkWrite100EntryWithoutBatch(b *testing.B) { benchmarkWriteEntry(b, 100, 0) } diff --git a/server/storage/wal/wal_test.go b/server/storage/wal/wal_test.go index c74f82a85..5a8ad0dc4 100644 --- a/server/storage/wal/wal_test.go +++ b/server/storage/wal/wal_test.go @@ -30,11 +30,12 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.etcd.io/raft/v3/raftpb" - "go.uber.org/zap/zaptest" ) var ( diff --git a/server/storage/wal/walpb/record_test.go b/server/storage/wal/walpb/record_test.go index 2e6349d44..cdacb3d03 100644 --- a/server/storage/wal/walpb/record_test.go +++ b/server/storage/wal/walpb/record_test.go @@ -18,6 +18,7 @@ import ( "testing" "github.com/golang/protobuf/descriptor" + "go.etcd.io/raft/v3/raftpb" ) diff --git a/tests/common/auth_test.go b/tests/common/auth_test.go index bdd92b017..f93aeb8c3 100644 --- a/tests/common/auth_test.go +++ b/tests/common/auth_test.go @@ -20,6 +20,7 @@ import ( "time" "github.com/stretchr/testify/require" + "go.etcd.io/etcd/tests/v3/framework/config" "go.etcd.io/etcd/tests/v3/framework/testutils" ) diff --git a/tests/common/compact_test.go b/tests/common/compact_test.go index e402565d0..fe068a77a 100644 --- a/tests/common/compact_test.go +++ b/tests/common/compact_test.go @@ -21,6 +21,7 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.etcd.io/etcd/tests/v3/framework/config" "go.etcd.io/etcd/tests/v3/framework/testutils" ) diff --git a/tests/common/endpoint_test.go b/tests/common/endpoint_test.go index d1dcb29d9..ccfeef3d9 100644 --- a/tests/common/endpoint_test.go +++ b/tests/common/endpoint_test.go @@ -21,6 +21,7 @@ import ( "time" "github.com/stretchr/testify/require" + "go.etcd.io/etcd/tests/v3/framework/config" "go.etcd.io/etcd/tests/v3/framework/testutils" ) diff --git a/tests/common/kv_test.go b/tests/common/kv_test.go index f894131ce..e271110ff 100644 --- a/tests/common/kv_test.go +++ b/tests/common/kv_test.go @@ -20,6 +20,7 @@ import ( "time" "github.com/stretchr/testify/assert" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/tests/v3/framework/config" "go.etcd.io/etcd/tests/v3/framework/testutils" diff --git a/tests/common/lease_test.go b/tests/common/lease_test.go index 61157f0d7..572602805 100644 --- a/tests/common/lease_test.go +++ b/tests/common/lease_test.go @@ -20,6 +20,7 @@ import ( "time" "github.com/stretchr/testify/require" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/tests/v3/framework/config" "go.etcd.io/etcd/tests/v3/framework/testutils" diff --git a/tests/common/member_test.go b/tests/common/member_test.go index b7953226a..ec2a15f62 100644 --- a/tests/common/member_test.go +++ b/tests/common/member_test.go @@ -20,6 +20,7 @@ import ( "time" "github.com/stretchr/testify/require" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/etcd/tests/v3/framework/config" diff --git a/tests/common/txn_test.go b/tests/common/txn_test.go index 5ffee4e15..c906f6819 100644 --- a/tests/common/txn_test.go +++ b/tests/common/txn_test.go @@ -21,6 +21,7 @@ import ( "time" "github.com/stretchr/testify/assert" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/tests/v3/framework/config" diff --git a/tests/common/user_test.go b/tests/common/user_test.go index d921f8dd6..f784fc2c4 100644 --- a/tests/common/user_test.go +++ b/tests/common/user_test.go @@ -20,6 +20,7 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.etcd.io/etcd/tests/v3/framework/config" "go.etcd.io/etcd/tests/v3/framework/testutils" ) diff --git a/tests/common/watch_test.go b/tests/common/watch_test.go index 725ffbb9c..103a4bb03 100644 --- a/tests/common/watch_test.go +++ b/tests/common/watch_test.go @@ -20,6 +20,7 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.etcd.io/etcd/tests/v3/framework/config" "go.etcd.io/etcd/tests/v3/framework/testutils" ) diff --git a/tests/e2e/cluster_downgrade_test.go b/tests/e2e/cluster_downgrade_test.go index 6b880d671..e15ba4eb2 100644 --- a/tests/e2e/cluster_downgrade_test.go +++ b/tests/e2e/cluster_downgrade_test.go @@ -25,12 +25,13 @@ import ( "github.com/coreos/go-semver/semver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/zap" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/client/pkg/v3/fileutil" clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/tests/v3/framework/e2e" "go.etcd.io/etcd/tests/v3/framework/testutils" - "go.uber.org/zap" ) func TestDowngradeUpgradeClusterOf1(t *testing.T) { diff --git a/tests/e2e/corrupt_test.go b/tests/e2e/corrupt_test.go index a51d199b8..f4be8da45 100644 --- a/tests/e2e/corrupt_test.go +++ b/tests/e2e/corrupt_test.go @@ -21,6 +21,7 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.etcd.io/etcd/api/v3/etcdserverpb" clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/storage/datadir" diff --git a/tests/e2e/ctl_v3_auth_test.go b/tests/e2e/ctl_v3_auth_test.go index 8c3d01f91..a2ffb1b43 100644 --- a/tests/e2e/ctl_v3_auth_test.go +++ b/tests/e2e/ctl_v3_auth_test.go @@ -22,6 +22,7 @@ import ( "time" "github.com/stretchr/testify/require" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/tests/v3/framework/e2e" ) diff --git a/tests/e2e/ctl_v3_completion_test.go b/tests/e2e/ctl_v3_completion_test.go index 0981c69ac..3b4113f34 100644 --- a/tests/e2e/ctl_v3_completion_test.go +++ b/tests/e2e/ctl_v3_completion_test.go @@ -24,6 +24,7 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.etcd.io/etcd/tests/v3/framework/e2e" ) diff --git a/tests/e2e/ctl_v3_elect_test.go b/tests/e2e/ctl_v3_elect_test.go index f3808e006..386a5f7db 100644 --- a/tests/e2e/ctl_v3_elect_test.go +++ b/tests/e2e/ctl_v3_elect_test.go @@ -22,6 +22,7 @@ import ( "time" "github.com/stretchr/testify/require" + "go.etcd.io/etcd/pkg/v3/expect" "go.etcd.io/etcd/tests/v3/framework/e2e" ) diff --git a/tests/e2e/ctl_v3_grpc_test.go b/tests/e2e/ctl_v3_grpc_test.go index e2f5c563c..a26b5d2a9 100644 --- a/tests/e2e/ctl_v3_grpc_test.go +++ b/tests/e2e/ctl_v3_grpc_test.go @@ -24,6 +24,7 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.etcd.io/etcd/tests/v3/framework/config" "go.etcd.io/etcd/tests/v3/framework/e2e" "go.etcd.io/etcd/tests/v3/framework/testutils" diff --git a/tests/e2e/ctl_v3_kv_test.go b/tests/e2e/ctl_v3_kv_test.go index f8a0a23b8..9df307ba0 100644 --- a/tests/e2e/ctl_v3_kv_test.go +++ b/tests/e2e/ctl_v3_kv_test.go @@ -21,6 +21,7 @@ import ( "time" "github.com/stretchr/testify/require" + "go.etcd.io/etcd/tests/v3/framework/e2e" ) diff --git a/tests/e2e/ctl_v3_lock_test.go b/tests/e2e/ctl_v3_lock_test.go index 4f3e329e5..cc0822f26 100644 --- a/tests/e2e/ctl_v3_lock_test.go +++ b/tests/e2e/ctl_v3_lock_test.go @@ -23,6 +23,7 @@ import ( "time" "github.com/stretchr/testify/require" + "go.etcd.io/etcd/pkg/v3/expect" "go.etcd.io/etcd/tests/v3/framework/e2e" ) diff --git a/tests/e2e/ctl_v3_move_leader_test.go b/tests/e2e/ctl_v3_move_leader_test.go index da4bfdd64..b22a832cb 100644 --- a/tests/e2e/ctl_v3_move_leader_test.go +++ b/tests/e2e/ctl_v3_move_leader_test.go @@ -22,6 +22,7 @@ import ( "time" "github.com/stretchr/testify/require" + "go.etcd.io/etcd/client/pkg/v3/transport" "go.etcd.io/etcd/client/pkg/v3/types" clientv3 "go.etcd.io/etcd/client/v3" diff --git a/tests/e2e/ctl_v3_snapshot_test.go b/tests/e2e/ctl_v3_snapshot_test.go index c45af2089..258bc5213 100644 --- a/tests/e2e/ctl_v3_snapshot_test.go +++ b/tests/e2e/ctl_v3_snapshot_test.go @@ -26,6 +26,7 @@ import ( "time" "github.com/stretchr/testify/require" + "go.etcd.io/etcd/etcdutl/v3/snapshot" "go.etcd.io/etcd/pkg/v3/expect" "go.etcd.io/etcd/tests/v3/framework/e2e" diff --git a/tests/e2e/ctl_v3_test.go b/tests/e2e/ctl_v3_test.go index d08306396..53a273098 100644 --- a/tests/e2e/ctl_v3_test.go +++ b/tests/e2e/ctl_v3_test.go @@ -23,6 +23,7 @@ import ( "time" "github.com/stretchr/testify/assert" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/pkg/v3/flags" diff --git a/tests/e2e/etcd_config_test.go b/tests/e2e/etcd_config_test.go index ac0096cfd..2f6cc846f 100644 --- a/tests/e2e/etcd_config_test.go +++ b/tests/e2e/etcd_config_test.go @@ -22,6 +22,7 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.etcd.io/etcd/pkg/v3/expect" "go.etcd.io/etcd/tests/v3/framework/e2e" ) diff --git a/tests/e2e/etcd_grpcproxy_test.go b/tests/e2e/etcd_grpcproxy_test.go index a807162ef..08134449d 100644 --- a/tests/e2e/etcd_grpcproxy_test.go +++ b/tests/e2e/etcd_grpcproxy_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/pkg/v3/expect" diff --git a/tests/e2e/utl_migrate_test.go b/tests/e2e/utl_migrate_test.go index 991e38d89..60f6f46a3 100644 --- a/tests/e2e/utl_migrate_test.go +++ b/tests/e2e/utl_migrate_test.go @@ -25,12 +25,13 @@ import ( "github.com/coreos/go-semver/semver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/server/v3/storage/backend" "go.etcd.io/etcd/server/v3/storage/schema" "go.etcd.io/etcd/tests/v3/framework/e2e" - "go.uber.org/zap/zaptest" ) func TestEtctlutlMigrate(t *testing.T) { diff --git a/tests/e2e/v2store_deprecation_test.go b/tests/e2e/v2store_deprecation_test.go index cb1d7b38b..500e46149 100644 --- a/tests/e2e/v2store_deprecation_test.go +++ b/tests/e2e/v2store_deprecation_test.go @@ -23,13 +23,14 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.uber.org/zap/zaptest" + "go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/server/v3/etcdserver" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" "go.etcd.io/etcd/tests/v3/framework/config" "go.etcd.io/etcd/tests/v3/framework/e2e" - "go.uber.org/zap/zaptest" ) func createV2store(t testing.TB, dataDirPath string) string { diff --git a/tests/e2e/v3_cipher_suite_test.go b/tests/e2e/v3_cipher_suite_test.go index 38973fbe0..539a41618 100644 --- a/tests/e2e/v3_cipher_suite_test.go +++ b/tests/e2e/v3_cipher_suite_test.go @@ -21,6 +21,7 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.etcd.io/etcd/api/v3/version" "go.etcd.io/etcd/tests/v3/framework/e2e" ) diff --git a/tests/e2e/v3_curl_maxstream_test.go b/tests/e2e/v3_curl_maxstream_test.go index 8a59b26a7..11a95a901 100644 --- a/tests/e2e/v3_curl_maxstream_test.go +++ b/tests/e2e/v3_curl_maxstream_test.go @@ -26,6 +26,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/client/pkg/v3/testutil" "go.etcd.io/etcd/tests/v3/framework/e2e" diff --git a/tests/e2e/v3_curl_test.go b/tests/e2e/v3_curl_test.go index 3215f1ca9..0753e26e2 100644 --- a/tests/e2e/v3_curl_test.go +++ b/tests/e2e/v3_curl_test.go @@ -25,6 +25,7 @@ import ( "testing" "github.com/stretchr/testify/require" + "go.etcd.io/etcd/api/v3/authpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" diff --git a/tests/functional/cmd/etcd-tester/etcd_tester_test.go b/tests/functional/cmd/etcd-tester/etcd_tester_test.go index 12ce67dd0..e545c5736 100644 --- a/tests/functional/cmd/etcd-tester/etcd_tester_test.go +++ b/tests/functional/cmd/etcd-tester/etcd_tester_test.go @@ -19,11 +19,12 @@ import ( "flag" "testing" - "go.etcd.io/etcd/client/pkg/v3/testutil" - "go.etcd.io/etcd/tests/v3/functional/tester" "go.uber.org/zap" "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest" + + "go.etcd.io/etcd/client/pkg/v3/testutil" + "go.etcd.io/etcd/tests/v3/functional/tester" ) var config = flag.String("config", "../../functional.yaml", "path to tester configuration") diff --git a/tests/functional/tester/cluster_test.go b/tests/functional/tester/cluster_test.go index 975119280..ec65b3507 100644 --- a/tests/functional/tester/cluster_test.go +++ b/tests/functional/tester/cluster_test.go @@ -19,8 +19,9 @@ import ( "sort" "testing" - "go.etcd.io/etcd/tests/v3/functional/rpcpb" "go.uber.org/zap/zaptest" + + "go.etcd.io/etcd/tests/v3/functional/rpcpb" ) func Test_read(t *testing.T) { diff --git a/tests/integration/clientv3/kv_test.go b/tests/integration/clientv3/kv_test.go index d5a1b0b2e..3442f5285 100644 --- a/tests/integration/clientv3/kv_test.go +++ b/tests/integration/clientv3/kv_test.go @@ -25,14 +25,15 @@ import ( "testing" "time" + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/version" clientv3 "go.etcd.io/etcd/client/v3" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" - "google.golang.org/grpc" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" ) func TestKVPutError(t *testing.T) { diff --git a/tests/integration/clientv3/metrics_test.go b/tests/integration/clientv3/metrics_test.go index 2c547843c..a0231946d 100644 --- a/tests/integration/clientv3/metrics_test.go +++ b/tests/integration/clientv3/metrics_test.go @@ -27,10 +27,11 @@ import ( grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" + "google.golang.org/grpc" + "go.etcd.io/etcd/client/pkg/v3/transport" clientv3 "go.etcd.io/etcd/client/v3" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" - "google.golang.org/grpc" ) func TestV3ClientMetrics(t *testing.T) { diff --git a/tests/integration/clientv3/mirror_auth_test.go b/tests/integration/clientv3/mirror_auth_test.go index dd8ae59d8..8dedd4e94 100644 --- a/tests/integration/clientv3/mirror_auth_test.go +++ b/tests/integration/clientv3/mirror_auth_test.go @@ -22,11 +22,12 @@ import ( "testing" "time" + "google.golang.org/grpc" + "go.etcd.io/etcd/api/v3/mvccpb" clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/mirror" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" - "google.golang.org/grpc" ) func TestMirrorSync_Authenticated(t *testing.T) { diff --git a/tests/integration/clientv3/ordering_kv_test.go b/tests/integration/clientv3/ordering_kv_test.go index 935bbaacf..11cb9080a 100644 --- a/tests/integration/clientv3/ordering_kv_test.go +++ b/tests/integration/clientv3/ordering_kv_test.go @@ -21,6 +21,7 @@ import ( "time" "github.com/stretchr/testify/assert" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/ordering" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" diff --git a/tests/integration/clientv3/user_test.go b/tests/integration/clientv3/user_test.go index 8fce09e92..a6698d32e 100644 --- a/tests/integration/clientv3/user_test.go +++ b/tests/integration/clientv3/user_test.go @@ -19,10 +19,11 @@ import ( "testing" "time" + "google.golang.org/grpc" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" clientv3 "go.etcd.io/etcd/client/v3" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" - "google.golang.org/grpc" ) func TestUserError(t *testing.T) { diff --git a/tests/integration/clientv3/watch_test.go b/tests/integration/clientv3/watch_test.go index db42bfb77..28e0faa41 100644 --- a/tests/integration/clientv3/watch_test.go +++ b/tests/integration/clientv3/watch_test.go @@ -24,13 +24,14 @@ import ( "testing" "time" + "google.golang.org/grpc/metadata" + mvccpb "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/api/v3/version" clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" - "google.golang.org/grpc/metadata" ) type watcherTest func(*testing.T, *watchctx) diff --git a/tests/integration/corrupt_test.go b/tests/integration/corrupt_test.go index cd695c578..c93cd0ff8 100644 --- a/tests/integration/corrupt_test.go +++ b/tests/integration/corrupt_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.etcd.io/etcd/api/v3/etcdserverpb" clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/storage/mvcc/testutil" diff --git a/tests/integration/grpc_test.go b/tests/integration/grpc_test.go index 47519bfb9..618c63f71 100644 --- a/tests/integration/grpc_test.go +++ b/tests/integration/grpc_test.go @@ -22,9 +22,10 @@ import ( "testing" "time" + "google.golang.org/grpc" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/tests/v3/framework/integration" - "google.golang.org/grpc" ) func TestAuthority(t *testing.T) { diff --git a/tests/integration/member_test.go b/tests/integration/member_test.go index 9443e1ba2..6581b654b 100644 --- a/tests/integration/member_test.go +++ b/tests/integration/member_test.go @@ -20,6 +20,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "go.etcd.io/etcd/tests/v3/framework/integration" ) diff --git a/tests/integration/proxy/grpcproxy/cluster_test.go b/tests/integration/proxy/grpcproxy/cluster_test.go index 42b7e0663..9177eb99d 100644 --- a/tests/integration/proxy/grpcproxy/cluster_test.go +++ b/tests/integration/proxy/grpcproxy/cluster_test.go @@ -20,14 +20,14 @@ import ( "testing" "time" + "go.uber.org/zap" + "go.uber.org/zap/zaptest" + "google.golang.org/grpc" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/proxy/grpcproxy" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" - "go.uber.org/zap/zaptest" - - "go.uber.org/zap" - "google.golang.org/grpc" ) func TestClusterProxyMemberList(t *testing.T) { diff --git a/tests/integration/proxy/grpcproxy/kv_test.go b/tests/integration/proxy/grpcproxy/kv_test.go index 619bba7f0..524f1392d 100644 --- a/tests/integration/proxy/grpcproxy/kv_test.go +++ b/tests/integration/proxy/grpcproxy/kv_test.go @@ -20,11 +20,12 @@ import ( "testing" "time" + "google.golang.org/grpc" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/proxy/grpcproxy" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" - "google.golang.org/grpc" ) func TestKVProxyRange(t *testing.T) { diff --git a/tests/integration/proxy/grpcproxy/register_test.go b/tests/integration/proxy/grpcproxy/register_test.go index e4f8f004d..da5eca001 100644 --- a/tests/integration/proxy/grpcproxy/register_test.go +++ b/tests/integration/proxy/grpcproxy/register_test.go @@ -18,11 +18,12 @@ import ( "testing" "time" + "go.uber.org/zap/zaptest" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/naming/endpoints" "go.etcd.io/etcd/server/v3/proxy/grpcproxy" integration2 "go.etcd.io/etcd/tests/v3/framework/integration" - "go.uber.org/zap/zaptest" ) func TestRegister(t *testing.T) { diff --git a/tests/integration/tracing_test.go b/tests/integration/tracing_test.go index 53fe379a5..a90586836 100644 --- a/tests/integration/tracing_test.go +++ b/tests/integration/tracing_test.go @@ -21,16 +21,17 @@ import ( "time" "github.com/stretchr/testify/require" - "go.etcd.io/etcd/client/pkg/v3/testutil" - clientv3 "go.etcd.io/etcd/client/v3" - "go.etcd.io/etcd/server/v3/embed" - "go.etcd.io/etcd/tests/v3/framework/integration" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "go.opentelemetry.io/otel/propagation" sdktrace "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/trace" traceservice "go.opentelemetry.io/proto/otlp/collector/trace/v1" "google.golang.org/grpc" + + "go.etcd.io/etcd/client/pkg/v3/testutil" + clientv3 "go.etcd.io/etcd/client/v3" + "go.etcd.io/etcd/server/v3/embed" + "go.etcd.io/etcd/tests/v3/framework/integration" ) // TestTracing ensures that distributed tracing is setup when the feature flag is enabled. diff --git a/tests/integration/utl_wal_version_test.go b/tests/integration/utl_wal_version_test.go index e5318c664..c0b75f9a5 100644 --- a/tests/integration/utl_wal_version_test.go +++ b/tests/integration/utl_wal_version_test.go @@ -21,7 +21,6 @@ import ( "github.com/coreos/go-semver/semver" "github.com/stretchr/testify/assert" - "go.etcd.io/etcd/tests/v3/framework/integration" "go.uber.org/zap" "go.etcd.io/etcd/client/pkg/v3/testutil" @@ -29,6 +28,7 @@ import ( "go.etcd.io/etcd/server/v3/embed" "go.etcd.io/etcd/server/v3/storage/wal" "go.etcd.io/etcd/server/v3/storage/wal/walpb" + "go.etcd.io/etcd/tests/v3/framework/integration" ) func TestEtcdVersionFromWAL(t *testing.T) { diff --git a/tests/integration/v3_alarm_test.go b/tests/integration/v3_alarm_test.go index 28dcb483a..4bd722eae 100644 --- a/tests/integration/v3_alarm_test.go +++ b/tests/integration/v3_alarm_test.go @@ -22,6 +22,8 @@ import ( "testing" "time" + "go.uber.org/zap/zaptest" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/pkg/v3/traceutil" @@ -30,7 +32,6 @@ import ( "go.etcd.io/etcd/server/v3/storage/mvcc" "go.etcd.io/etcd/server/v3/storage/schema" "go.etcd.io/etcd/tests/v3/framework/integration" - "go.uber.org/zap/zaptest" ) // TestV3StorageQuotaApply tests the V3 server respects quotas during apply diff --git a/tests/integration/v3_grpc_inflight_test.go b/tests/integration/v3_grpc_inflight_test.go index daf5c3bbe..7968e614e 100644 --- a/tests/integration/v3_grpc_inflight_test.go +++ b/tests/integration/v3_grpc_inflight_test.go @@ -20,12 +20,13 @@ import ( "testing" "time" - pb "go.etcd.io/etcd/api/v3/etcdserverpb" - "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" - "go.etcd.io/etcd/tests/v3/framework/integration" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + pb "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" + "go.etcd.io/etcd/tests/v3/framework/integration" ) // TestV3MaintenanceDefragmentInflightRange ensures inflight range requests diff --git a/tests/integration/v3_leadership_test.go b/tests/integration/v3_leadership_test.go index c3cbb5543..7956205c5 100644 --- a/tests/integration/v3_leadership_test.go +++ b/tests/integration/v3_leadership_test.go @@ -21,10 +21,11 @@ import ( "testing" "time" + "golang.org/x/sync/errgroup" + pb "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/tests/v3/framework/integration" - "golang.org/x/sync/errgroup" ) func TestMoveLeader(t *testing.T) { testMoveLeader(t, true) } diff --git a/tests/integration/v3_tls_test.go b/tests/integration/v3_tls_test.go index a96e888b2..318466d0c 100644 --- a/tests/integration/v3_tls_test.go +++ b/tests/integration/v3_tls_test.go @@ -20,9 +20,10 @@ import ( "testing" "time" + "google.golang.org/grpc" + clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/tests/v3/framework/integration" - "google.golang.org/grpc" ) func TestTLSClientCipherSuitesValid(t *testing.T) { testTLSCipherSuites(t, true) } diff --git a/tests/linearizability/linearizability_test.go b/tests/linearizability/linearizability_test.go index 3295c9650..3a5e1a813 100644 --- a/tests/linearizability/linearizability_test.go +++ b/tests/linearizability/linearizability_test.go @@ -25,8 +25,9 @@ import ( "time" "github.com/anishathalye/porcupine" - "go.etcd.io/etcd/tests/v3/framework/e2e" "golang.org/x/time/rate" + + "go.etcd.io/etcd/tests/v3/framework/e2e" ) const (