Skip to content

Commit ffea153

Browse files
ptaborptabor
committed
ClientV3 tests use integration.NewClient that configures proper logger.
1 parent bc8d3f6 commit ffea153

35 files changed

+103
-72
lines changed

‎client/pkg/transport/sockopt_unix.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
package transport
55

66
import (
7-
"golang.org/x/sys/unix"
87
"syscall"
8+
9+
"golang.org/x/sys/unix"
910
)
1011

1112
func setReusePort(network, address string, conn syscall.RawConn) error {

‎client/pkg/types/urlsmap_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@
1515
package types
1616

1717
import (
18-
"go.etcd.io/etcd/client/pkg/v3/testutil"
1918
"reflect"
2019
"testing"
20+
21+
"go.etcd.io/etcd/client/pkg/v3/testutil"
2122
)
2223

2324
func TestParseInitialCluster(t *testing.T) {

‎client/v2/json.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
package client
1616

1717
import (
18-
"github.com/json-iterator/go"
19-
"github.com/modern-go/reflect2"
2018
"strconv"
2119
"unsafe"
20+
21+
"github.com/json-iterator/go"
22+
"github.com/modern-go/reflect2"
2223
)
2324

2425
type customNumberExtension struct {

‎client/v2/keys.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ import (
1919
"encoding/json"
2020
"errors"
2121
"fmt"
22-
"go.etcd.io/etcd/client/pkg/v3/pathutil"
2322
"net/http"
2423
"net/url"
2524
"strconv"
2625
"strings"
2726
"time"
27+
28+
"go.etcd.io/etcd/client/pkg/v3/pathutil"
2829
)
2930

3031
const (

‎client/v3/client_test.go

+12-3
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,19 @@ import (
2323

2424
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
2525
"go.etcd.io/etcd/client/pkg/v3/testutil"
26+
"go.uber.org/zap/zaptest"
2627

2728
"google.golang.org/grpc"
2829
)
2930

31+
func NewClient(t *testing.T, cfg Config) (*Client, error) {
32+
client, err := New(cfg)
33+
if err != nil {
34+
return nil, err
35+
}
36+
return client.WithLogger(zaptest.NewLogger(t)), nil
37+
}
38+
3039
func TestDialCancel(t *testing.T) {
3140
testutil.BeforeTest(t)
3241

@@ -41,7 +50,7 @@ func TestDialCancel(t *testing.T) {
4150
cfg := Config{
4251
Endpoints: []string{ep},
4352
DialTimeout: 30 * time.Second}
44-
c, err := New(cfg)
53+
c, err := NewClient(t, cfg)
4554
if err != nil {
4655
t.Fatal(err)
4756
}
@@ -104,7 +113,7 @@ func TestDialTimeout(t *testing.T) {
104113
donec := make(chan error, 1)
105114
go func(cfg Config) {
106115
// without timeout, dial continues forever on ipv4 black hole
107-
c, err := New(cfg)
116+
c, err := NewClient(t, cfg)
108117
if c != nil || err == nil {
109118
t.Errorf("#%d: new client should fail", i)
110119
}
@@ -132,7 +141,7 @@ func TestDialTimeout(t *testing.T) {
132141

133142
func TestDialNoTimeout(t *testing.T) {
134143
cfg := Config{Endpoints: []string{"127.0.0.1:12345"}}
135-
c, err := New(cfg)
144+
c, err := NewClient(t, cfg)
136145
if c == nil || err != nil {
137146
t.Fatalf("new client with DialNoWait should succeed, got %v", err)
138147
}

‎contrib/lock/client/client.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@ import (
2626
"bytes"
2727
"encoding/json"
2828
"fmt"
29-
"go.etcd.io/etcd/client/v3"
30-
"go.etcd.io/etcd/client/v3/concurrency"
3129
"io/ioutil"
3230
"net/http"
3331
"os"
3432
"runtime"
3533
"strconv"
3634
"time"
35+
36+
"go.etcd.io/etcd/client/v3"
37+
"go.etcd.io/etcd/client/v3/concurrency"
3738
)
3839

3940
type node struct {

‎etcdctl/ctlv3/command/make_mirror_command.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ import (
1818
"context"
1919
"errors"
2020
"fmt"
21-
"github.com/bgentry/speakeasy"
2221
"strings"
2322
"sync/atomic"
2423
"time"
2524

25+
"github.com/bgentry/speakeasy"
26+
2627
"go.etcd.io/etcd/api/v3/mvccpb"
2728
"go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
2829
"go.etcd.io/etcd/client/v3"

‎server/auth/metrics.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
package auth
1616

1717
import (
18-
"github.com/prometheus/client_golang/prometheus"
1918
"sync"
19+
20+
"github.com/prometheus/client_golang/prometheus"
2021
)
2122

2223
var (

‎server/etcdserver/api/v2http/metrics.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515
package v2http
1616

1717
import (
18+
"net/http"
1819
"strconv"
1920
"time"
2021

21-
"net/http"
22-
2322
"go.etcd.io/etcd/api/v3/etcdserverpb"
2423
"go.etcd.io/etcd/server/v3/etcdserver/api/v2error"
2524
"go.etcd.io/etcd/server/v3/etcdserver/api/v2http/httptypes"

‎server/etcdserver/zap_raft_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,16 @@ package etcdserver
1717
import (
1818
"bytes"
1919
"fmt"
20-
"go.etcd.io/etcd/client/pkg/v3/logutil"
21-
"go.uber.org/zap"
22-
"go.uber.org/zap/zapcore"
2320
"io/ioutil"
2421
"os"
2522
"path/filepath"
2623
"strings"
2724
"testing"
2825
"time"
26+
27+
"go.etcd.io/etcd/client/pkg/v3/logutil"
28+
"go.uber.org/zap"
29+
"go.uber.org/zap/zapcore"
2930
)
3031

3132
func TestNewRaftLogger(t *testing.T) {

‎tests/integration/clientv3/concurrency/election_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ import (
2323

2424
"go.etcd.io/etcd/client/v3"
2525
"go.etcd.io/etcd/client/v3/concurrency"
26+
"go.etcd.io/etcd/tests/v3/integration"
2627
)
2728

2829
func TestResumeElection(t *testing.T) {
2930
const prefix = "/resume-election/"
3031

31-
cli, err := clientv3.New(clientv3.Config{Endpoints: exampleEndpoints()})
32+
cli, err := integration.NewClient(t, clientv3.Config{Endpoints: exampleEndpoints()})
3233
if err != nil {
3334
log.Fatal(err)
3435
}

‎tests/integration/clientv3/concurrency/mutex_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ import (
2020

2121
"go.etcd.io/etcd/client/v3"
2222
"go.etcd.io/etcd/client/v3/concurrency"
23+
"go.etcd.io/etcd/tests/v3/integration"
2324
)
2425

2526
func TestMutexLockSessionExpired(t *testing.T) {
26-
cli, err := clientv3.New(clientv3.Config{Endpoints: exampleEndpoints()})
27+
cli, err := integration.NewClient(t, clientv3.Config{Endpoints: exampleEndpoints()})
2728
if err != nil {
2829
t.Fatal(err)
2930
}

‎tests/integration/clientv3/connectivity/black_hole_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func TestBalancerUnderBlackholeKeepAliveWatch(t *testing.T) {
5959
// then we can reduce 3s to 1s.
6060
timeout := pingInterval + integration.RequestWaitTimeout
6161

62-
cli, err := clientv3.New(ccfg)
62+
cli, err := integration.NewClient(t, ccfg)
6363
if err != nil {
6464
t.Fatal(err)
6565
}
@@ -180,7 +180,7 @@ func testBalancerUnderBlackholeNoKeepAlive(t *testing.T, op func(*clientv3.Clien
180180
DialTimeout: 1 * time.Second,
181181
DialOptions: []grpc.DialOption{grpc.WithBlock()},
182182
}
183-
cli, err := clientv3.New(ccfg)
183+
cli, err := integration.NewClient(t, ccfg)
184184
if err != nil {
185185
t.Fatal(err)
186186
}

‎tests/integration/clientv3/connectivity/dial_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func TestDialTLSExpired(t *testing.T) {
5656
t.Fatal(err)
5757
}
5858
// expect remote errors "tls: bad certificate"
59-
_, err = clientv3.New(clientv3.Config{
59+
_, err = integration.NewClient(t, clientv3.Config{
6060
Endpoints: []string{clus.Members[0].GRPCAddr()},
6161
DialTimeout: 3 * time.Second,
6262
DialOptions: []grpc.DialOption{grpc.WithBlock()},
@@ -74,7 +74,7 @@ func TestDialTLSNoConfig(t *testing.T) {
7474
clus := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1, ClientTLS: &testTLSInfo, SkipCreatingClient: true})
7575
defer clus.Terminate(t)
7676
// expect "signed by unknown authority"
77-
c, err := clientv3.New(clientv3.Config{
77+
c, err := integration.NewClient(t, clientv3.Config{
7878
Endpoints: []string{clus.Members[0].GRPCAddr()},
7979
DialTimeout: time.Second,
8080
DialOptions: []grpc.DialOption{grpc.WithBlock()},
@@ -117,7 +117,7 @@ func testDialSetEndpoints(t *testing.T, setBefore bool) {
117117
DialTimeout: 1 * time.Second,
118118
DialOptions: []grpc.DialOption{grpc.WithBlock()},
119119
}
120-
cli, err := clientv3.New(cfg)
120+
cli, err := integration.NewClient(t, cfg)
121121
if err != nil {
122122
t.Fatal(err)
123123
}
@@ -175,7 +175,7 @@ func TestRejectOldCluster(t *testing.T) {
175175
DialOptions: []grpc.DialOption{grpc.WithBlock()},
176176
RejectOldCluster: true,
177177
}
178-
cli, err := clientv3.New(cfg)
178+
cli, err := integration.NewClient(t, cfg)
179179
if err != nil {
180180
t.Fatal(err)
181181
}

‎tests/integration/clientv3/connectivity/network_partition_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func testBalancerUnderNetworkPartition(t *testing.T, op func(*clientv3.Client, c
120120
DialTimeout: 3 * time.Second,
121121
DialOptions: []grpc.DialOption{grpc.WithBlock()},
122122
}
123-
cli, err := clientv3.New(ccfg)
123+
cli, err := integration.NewClient(t, ccfg)
124124
if err != nil {
125125
t.Fatal(err)
126126
}
@@ -174,7 +174,7 @@ func TestBalancerUnderNetworkPartitionLinearizableGetLeaderElection(t *testing.T
174174

175175
timeout := 3 * clus.Members[(lead+1)%2].ServerConfig.ReqTimeout()
176176

177-
cli, err := clientv3.New(clientv3.Config{
177+
cli, err := integration.NewClient(t, clientv3.Config{
178178
Endpoints: []string{eps[(lead+1)%2]},
179179
DialTimeout: 2 * time.Second,
180180
DialOptions: []grpc.DialOption{grpc.WithBlock()},
@@ -232,7 +232,7 @@ func testBalancerUnderNetworkPartitionWatch(t *testing.T, isolateLeader bool) {
232232
}
233233

234234
// pin eps[target]
235-
watchCli, err := clientv3.New(clientv3.Config{Endpoints: []string{eps[target]}})
235+
watchCli, err := integration.NewClient(t, clientv3.Config{Endpoints: []string{eps[target]}})
236236
if err != nil {
237237
t.Fatal(err)
238238
}
@@ -291,7 +291,7 @@ func TestDropReadUnderNetworkPartition(t *testing.T) {
291291
DialTimeout: 10 * time.Second,
292292
DialOptions: []grpc.DialOption{grpc.WithBlock()},
293293
}
294-
cli, err := clientv3.New(ccfg)
294+
cli, err := integration.NewClient(t, ccfg)
295295
if err != nil {
296296
t.Fatal(err)
297297
}

‎tests/integration/clientv3/connectivity/server_shutdown_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func TestBalancerUnderServerShutdownWatch(t *testing.T) {
4242
lead := clus.WaitLeader(t)
4343

4444
// pin eps[lead]
45-
watchCli, err := clientv3.New(clientv3.Config{Endpoints: []string{eps[lead]}})
45+
watchCli, err := integration.NewClient(t, clientv3.Config{Endpoints: []string{eps[lead]}})
4646
if err != nil {
4747
t.Fatal(err)
4848
}
@@ -88,7 +88,7 @@ func TestBalancerUnderServerShutdownWatch(t *testing.T) {
8888
clus.Members[lead].Terminate(t)
8989

9090
// writes to eps[lead+1]
91-
putCli, err := clientv3.New(clientv3.Config{Endpoints: []string{eps[(lead+1)%3]}})
91+
putCli, err := integration.NewClient(t, clientv3.Config{Endpoints: []string{eps[(lead+1)%3]}})
9292
if err != nil {
9393
t.Fatal(err)
9494
}
@@ -152,7 +152,7 @@ func testBalancerUnderServerShutdownMutable(t *testing.T, op func(*clientv3.Clie
152152
eps := []string{clus.Members[0].GRPCAddr(), clus.Members[1].GRPCAddr(), clus.Members[2].GRPCAddr()}
153153

154154
// pin eps[0]
155-
cli, err := clientv3.New(clientv3.Config{Endpoints: []string{eps[0]}})
155+
cli, err := integration.NewClient(t, clientv3.Config{Endpoints: []string{eps[0]}})
156156
if err != nil {
157157
t.Fatal(err)
158158
}
@@ -210,7 +210,7 @@ func testBalancerUnderServerShutdownImmutable(t *testing.T, op func(*clientv3.Cl
210210
eps := []string{clus.Members[0].GRPCAddr(), clus.Members[1].GRPCAddr(), clus.Members[2].GRPCAddr()}
211211

212212
// pin eps[0]
213-
cli, err := clientv3.New(clientv3.Config{Endpoints: []string{eps[0]}})
213+
cli, err := integration.NewClient(t, clientv3.Config{Endpoints: []string{eps[0]}})
214214
if err != nil {
215215
t.Errorf("failed to create client: %v", err)
216216
}
@@ -293,7 +293,7 @@ func testBalancerUnderServerStopInflightRangeOnRestart(t *testing.T, linearizabl
293293
}
294294

295295
// pin eps[target]
296-
cli, err := clientv3.New(clientv3.Config{Endpoints: []string{eps[target]}})
296+
cli, err := integration.NewClient(t, clientv3.Config{Endpoints: []string{eps[target]}})
297297
if err != nil {
298298
t.Errorf("failed to create client: %v", err)
299299
}

‎tests/integration/clientv3/kv_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1034,7 +1034,7 @@ func TestKVForLearner(t *testing.T) {
10341034
DialOptions: []grpc.DialOption{grpc.WithBlock()},
10351035
}
10361036
// this client only has endpoint of the learner member
1037-
cli, err := clientv3.New(cfg)
1037+
cli, err := integration.NewClient(t, cfg)
10381038
if err != nil {
10391039
t.Fatalf("failed to create clientv3: %v", err)
10401040
}
@@ -1106,7 +1106,7 @@ func TestBalancerSupportLearner(t *testing.T) {
11061106
DialTimeout: 5 * time.Second,
11071107
DialOptions: []grpc.DialOption{grpc.WithBlock()},
11081108
}
1109-
cli, err := clientv3.New(cfg)
1109+
cli, err := integration.NewClient(t, cfg)
11101110
if err != nil {
11111111
t.Fatalf("failed to create clientv3: %v", err)
11121112
}

‎tests/integration/clientv3/maintenance_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ func TestMaintenanceStatus(t *testing.T) {
209209
eps[i] = clus.Members[i].GRPCAddr()
210210
}
211211

212-
cli, err := clientv3.New(clientv3.Config{Endpoints: eps, DialOptions: []grpc.DialOption{grpc.WithBlock()}})
212+
cli, err := integration.NewClient(t, clientv3.Config{Endpoints: eps, DialOptions: []grpc.DialOption{grpc.WithBlock()}})
213213
if err != nil {
214214
t.Fatal(err)
215215
}

‎tests/integration/clientv3/metrics_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func TestV3ClientMetrics(t *testing.T) {
8181
grpc.WithStreamInterceptor(grpcprom.StreamClientInterceptor),
8282
},
8383
}
84-
cli, cerr := clientv3.New(cfg)
84+
cli, cerr := integration.NewClient(t, cfg)
8585
if cerr != nil {
8686
t.Fatal(cerr)
8787
}

‎tests/integration/clientv3/ordering_kv_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestDetectKvOrderViolation(t *testing.T) {
4040
clus.Members[2].GRPCAddr(),
4141
},
4242
}
43-
cli, err := clientv3.New(cfg)
43+
cli, err := integration.NewClient(t, cfg)
4444
if err != nil {
4545
t.Fatal(err)
4646
}
@@ -107,7 +107,7 @@ func TestDetectTxnOrderViolation(t *testing.T) {
107107
clus.Members[2].GRPCAddr(),
108108
},
109109
}
110-
cli, err := clientv3.New(cfg)
110+
cli, err := integration.NewClient(t, cfg)
111111
if err != nil {
112112
t.Fatal(err)
113113
}

0 commit comments

Comments
 (0)