Skip to content

Commit 693c68d

Browse files
mmorel-35mmorel-35
committed
chore: enable thelper linter
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent 8731c31 commit 693c68d

21 files changed

+175
-179
lines changed

Diff for: ‎server/etcdserver/api/membership/cluster_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -652,8 +652,8 @@ func TestNodeToMember(t *testing.T) {
652652
}
653653
}
654654

655-
func newTestCluster(t testing.TB, membs []*Member) *RaftCluster {
656-
c := &RaftCluster{lg: zaptest.NewLogger(t), members: make(map[types.ID]*Member), removed: make(map[types.ID]bool)}
655+
func newTestCluster(tb testing.TB, membs []*Member) *RaftCluster {
656+
c := &RaftCluster{lg: zaptest.NewLogger(tb), members: make(map[types.ID]*Member), removed: make(map[types.ID]bool)}
657657
for _, m := range membs {
658658
c.members[m.ID] = m
659659
}

Diff for: ‎server/etcdserver/server_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -1513,12 +1513,12 @@ func (n *nodeConfChangeCommitterRecorder) ApplyConfChange(conf raftpb.ConfChange
15131513
return &raftpb.ConfState{}
15141514
}
15151515

1516-
func newTestCluster(t testing.TB) *membership.RaftCluster {
1517-
return membership.NewCluster(zaptest.NewLogger(t))
1516+
func newTestCluster(tb testing.TB) *membership.RaftCluster {
1517+
return membership.NewCluster(zaptest.NewLogger(tb))
15181518
}
15191519

1520-
func newTestClusterWithBackend(t testing.TB, membs []*membership.Member, be backend.Backend) *membership.RaftCluster {
1521-
lg := zaptest.NewLogger(t)
1520+
func newTestClusterWithBackend(tb testing.TB, membs []*membership.Member, be backend.Backend) *membership.RaftCluster {
1521+
lg := zaptest.NewLogger(tb)
15221522
c := membership.NewCluster(lg)
15231523
c.SetBackend(schema.NewMembershipBackend(lg, be))
15241524
for _, m := range membs {

Diff for: ‎server/lease/lessor_bench_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ func demote(le *lessor) {
6060
}
6161

6262
// return new lessor and tearDown to release resource
63-
func setUp(t testing.TB) (le *lessor, tearDown func()) {
63+
func setUp(tb testing.TB) (le *lessor, tearDown func()) {
6464
lg := zap.NewNop()
65-
be, _ := betesting.NewDefaultTmpBackend(t)
65+
be, _ := betesting.NewDefaultTmpBackend(tb)
6666
// MinLeaseTTL is negative, so we can grant expired lease in benchmark.
6767
// ExpiredLeasesRetryInterval should small, so benchmark of findExpired will recheck expired lease.
6868
le = newLessor(lg, be, nil, LessorConfig{MinLeaseTTL: -1000, ExpiredLeasesRetryInterval: 10 * time.Microsecond})

Diff for: ‎server/storage/backend/batch_tx_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -393,9 +393,9 @@ func checkUnsafeForEach(t *testing.T, tx backend.UnsafeReader, expectedKeys, exp
393393

394394
// runWriteback is used test the txWriteBuffer.writeback function, which is called inside tx.Unlock().
395395
// The parameters are chosen based on defaultBatchLimit = 10000
396-
func runWriteback(t testing.TB, kss, vss [][]string, isSeq bool) {
397-
b, _ := betesting.NewTmpBackend(t, time.Hour, 10000)
398-
defer betesting.Close(t, b)
396+
func runWriteback(tb testing.TB, kss, vss [][]string, isSeq bool) {
397+
b, _ := betesting.NewTmpBackend(tb, time.Hour, 10000)
398+
defer betesting.Close(tb, b)
399399

400400
tx := b.BatchTx()
401401

Diff for: ‎server/storage/backend/hooks_test.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ func TestBackendAutoCommitBatchIntervalHook(t *testing.T) {
9494
waitUntil(ctx, t, func() bool { return getCommitsKey(t, be) == ">ccc" })
9595
}
9696

97-
func waitUntil(ctx context.Context, t testing.TB, f func() bool) {
97+
func waitUntil(ctx context.Context, tb testing.TB, f func() bool) {
9898
for !f() {
9999
select {
100100
case <-ctx.Done():
101-
t.Fatalf("Context cancelled/timedout without condition met: %v", ctx.Err())
101+
tb.Fatalf("Context cancelled/timedout without condition met: %v", ctx.Err())
102102
default:
103103
}
104104
time.Sleep(10 * time.Millisecond)
@@ -112,28 +112,28 @@ func prepareBuckenAndKey(tx backend.BatchTx) {
112112
tx.UnsafePut(bucket, key, []byte(">"))
113113
}
114114

115-
func newTestHooksBackend(t testing.TB, baseConfig backend.BackendConfig) backend.Backend {
115+
func newTestHooksBackend(tb testing.TB, baseConfig backend.BackendConfig) backend.Backend {
116116
cfg := baseConfig
117117
cfg.Hooks = backend.NewHooks(func(tx backend.UnsafeReadWriter) {
118118
k, v := tx.UnsafeRange(bucket, key, nil, 1)
119-
t.Logf("OnPreCommit executed: %v %v", string(k[0]), string(v[0]))
120-
assert.Len(t, k, 1)
121-
assert.Len(t, v, 1)
119+
tb.Logf("OnPreCommit executed: %v %v", string(k[0]), string(v[0]))
120+
assert.Len(tb, k, 1)
121+
assert.Len(tb, v, 1)
122122
tx.UnsafePut(bucket, key, append(v[0], byte('c')))
123123
})
124124

125-
be, _ := betesting.NewTmpBackendFromCfg(t, cfg)
126-
t.Cleanup(func() {
127-
betesting.Close(t, be)
125+
be, _ := betesting.NewTmpBackendFromCfg(tb, cfg)
126+
tb.Cleanup(func() {
127+
betesting.Close(tb, be)
128128
})
129129
return be
130130
}
131131

132-
func getCommitsKey(t testing.TB, be backend.Backend) string {
132+
func getCommitsKey(tb testing.TB, be backend.Backend) string {
133133
rtx := be.BatchTx()
134134
rtx.Lock()
135135
defer rtx.Unlock()
136136
_, v := rtx.UnsafeRange(bucket, key, nil, 1)
137-
assert.Len(t, v, 1)
137+
assert.Len(tb, v, 1)
138138
return string(v[0])
139139
}

Diff for: ‎server/storage/backend/testing/betesting.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,28 @@ import (
2626
"go.etcd.io/etcd/server/v3/storage/backend"
2727
)
2828

29-
func NewTmpBackendFromCfg(t testing.TB, bcfg backend.BackendConfig) (backend.Backend, string) {
30-
dir, err := os.MkdirTemp(t.TempDir(), "etcd_backend_test")
29+
func NewTmpBackendFromCfg(tb testing.TB, bcfg backend.BackendConfig) (backend.Backend, string) {
30+
dir, err := os.MkdirTemp(tb.TempDir(), "etcd_backend_test")
3131
if err != nil {
3232
panic(err)
3333
}
3434
tmpPath := filepath.Join(dir, "database")
3535
bcfg.Path = tmpPath
36-
bcfg.Logger = zaptest.NewLogger(t)
36+
bcfg.Logger = zaptest.NewLogger(tb)
3737
return backend.New(bcfg), tmpPath
3838
}
3939

4040
// NewTmpBackend creates a backend implementation for testing.
41-
func NewTmpBackend(t testing.TB, batchInterval time.Duration, batchLimit int) (backend.Backend, string) {
42-
bcfg := backend.DefaultBackendConfig(zaptest.NewLogger(t))
41+
func NewTmpBackend(tb testing.TB, batchInterval time.Duration, batchLimit int) (backend.Backend, string) {
42+
bcfg := backend.DefaultBackendConfig(zaptest.NewLogger(tb))
4343
bcfg.BatchInterval, bcfg.BatchLimit = batchInterval, batchLimit
44-
return NewTmpBackendFromCfg(t, bcfg)
44+
return NewTmpBackendFromCfg(tb, bcfg)
4545
}
4646

47-
func NewDefaultTmpBackend(t testing.TB) (backend.Backend, string) {
48-
return NewTmpBackendFromCfg(t, backend.DefaultBackendConfig(zaptest.NewLogger(t)))
47+
func NewDefaultTmpBackend(tb testing.TB) (backend.Backend, string) {
48+
return NewTmpBackendFromCfg(tb, backend.DefaultBackendConfig(zaptest.NewLogger(tb)))
4949
}
5050

51-
func Close(t testing.TB, b backend.Backend) {
52-
assert.NoError(t, b.Close())
51+
func Close(tb testing.TB, b backend.Backend) {
52+
assert.NoError(tb, b.Close())
5353
}

Diff for: ‎server/storage/wal/testing/waltesting.go

+15-15
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,32 @@ import (
2828
"go.etcd.io/raft/v3/raftpb"
2929
)
3030

31-
func NewTmpWAL(t testing.TB, reqs []etcdserverpb.InternalRaftRequest) (*wal.WAL, string) {
32-
t.Helper()
33-
dir, err := os.MkdirTemp(t.TempDir(), "etcd_wal_test")
31+
func NewTmpWAL(tb testing.TB, reqs []etcdserverpb.InternalRaftRequest) (*wal.WAL, string) {
32+
tb.Helper()
33+
dir, err := os.MkdirTemp(tb.TempDir(), "etcd_wal_test")
3434
if err != nil {
3535
panic(err)
3636
}
3737
tmpPath := filepath.Join(dir, "wal")
38-
lg := zaptest.NewLogger(t)
38+
lg := zaptest.NewLogger(tb)
3939
w, err := wal.Create(lg, tmpPath, nil)
4040
if err != nil {
41-
t.Fatalf("Failed to create WAL: %v", err)
41+
tb.Fatalf("Failed to create WAL: %v", err)
4242
}
4343
err = w.Close()
4444
if err != nil {
45-
t.Fatalf("Failed to close WAL: %v", err)
45+
tb.Fatalf("Failed to close WAL: %v", err)
4646
}
4747
if len(reqs) != 0 {
4848
w, err = wal.Open(lg, tmpPath, walpb.Snapshot{})
4949
if err != nil {
50-
t.Fatalf("Failed to open WAL: %v", err)
50+
tb.Fatalf("Failed to open WAL: %v", err)
5151
}
5252

5353
var state raftpb.HardState
5454
_, state, _, err = w.ReadAll()
5555
if err != nil {
56-
t.Fatalf("Failed to read WAL: %v", err)
56+
tb.Fatalf("Failed to read WAL: %v", err)
5757
}
5858
var entries []raftpb.Entry
5959
for _, req := range reqs {
@@ -66,27 +66,27 @@ func NewTmpWAL(t testing.TB, reqs []etcdserverpb.InternalRaftRequest) (*wal.WAL,
6666
}
6767
err = w.Save(state, entries)
6868
if err != nil {
69-
t.Fatalf("Failed to save WAL: %v", err)
69+
tb.Fatalf("Failed to save WAL: %v", err)
7070
}
7171
err = w.Close()
7272
if err != nil {
73-
t.Fatalf("Failed to close WAL: %v", err)
73+
tb.Fatalf("Failed to close WAL: %v", err)
7474
}
7575
}
7676

7777
w, err = wal.OpenForRead(lg, tmpPath, walpb.Snapshot{})
7878
if err != nil {
79-
t.Fatalf("Failed to open WAL: %v", err)
79+
tb.Fatalf("Failed to open WAL: %v", err)
8080
}
8181
return w, tmpPath
8282
}
8383

84-
func Reopen(t testing.TB, walPath string) *wal.WAL {
85-
t.Helper()
86-
lg := zaptest.NewLogger(t)
84+
func Reopen(tb testing.TB, walPath string) *wal.WAL {
85+
tb.Helper()
86+
lg := zaptest.NewLogger(tb)
8787
w, err := wal.OpenForRead(lg, walPath, walpb.Snapshot{})
8888
if err != nil {
89-
t.Fatalf("Failed to open WAL: %v", err)
89+
tb.Fatalf("Failed to open WAL: %v", err)
9090
}
9191
return w
9292
}

Diff for: ‎tests/e2e/utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ func newClient(t *testing.T, entpoints []string, cfg e2e.ClientConfig) *clientv3
6969
}
7070

7171
// tlsInfo follows the Client-to-server communication in https://etcd.io/docs/v3.6/op-guide/security/#basic-setup
72-
func tlsInfo(t testing.TB, cfg e2e.ClientConfig) (*transport.TLSInfo, error) {
72+
func tlsInfo(tb testing.TB, cfg e2e.ClientConfig) (*transport.TLSInfo, error) {
7373
switch cfg.ConnectionType {
7474
case e2e.ClientNonTLS, e2e.ClientTLSAndNonTLS:
7575
return nil, nil
7676
case e2e.ClientTLS:
7777
if cfg.AutoTLS {
78-
tls, err := transport.SelfCert(zap.NewNop(), t.TempDir(), []string{"localhost"}, 1)
78+
tls, err := transport.SelfCert(zap.NewNop(), tb.TempDir(), []string{"localhost"}, 1)
7979
if err != nil {
8080
return nil, fmt.Errorf("failed to generate cert: %w", err)
8181
}

Diff for: ‎tests/e2e/v2store_deprecation_test.go

+28-28
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ import (
3939
"go.etcd.io/etcd/tests/v3/framework/e2e"
4040
)
4141

42-
func writeCustomV2Data(t testing.TB, epc *e2e.EtcdProcessCluster, count int) {
42+
func writeCustomV2Data(tb testing.TB, epc *e2e.EtcdProcessCluster, count int) {
4343
for i := 0; i < count; i++ {
4444
if err := e2e.CURLPut(epc, e2e.CURLReq{
4545
Endpoint: "/v2/keys/foo", Value: "bar" + fmt.Sprint(i),
4646
Expected: expect.ExpectedResponse{Value: `{"action":"set","node":{"key":"/foo","value":"bar` + fmt.Sprint(i)},
4747
}); err != nil {
48-
t.Fatalf("failed put with curl (%v)", err)
48+
tb.Fatalf("failed put with curl (%v)", err)
4949
}
5050
}
5151
}
@@ -191,47 +191,47 @@ func TestV2DeprecationSnapshotRecover(t *testing.T) {
191191
assert.NoError(t, epc.Close())
192192
}
193193

194-
func runEtcdAndCreateSnapshot(t testing.TB, serverVersion e2e.ClusterVersion, dataDir string, snapshotCount uint64) *e2e.EtcdProcessCluster {
194+
func runEtcdAndCreateSnapshot(tb testing.TB, serverVersion e2e.ClusterVersion, dataDir string, snapshotCount uint64) *e2e.EtcdProcessCluster {
195195
cfg := e2e.ConfigStandalone(*e2e.NewConfig(
196196
e2e.WithVersion(serverVersion),
197197
e2e.WithDataDirPath(dataDir),
198198
e2e.WithSnapshotCount(snapshotCount),
199199
e2e.WithKeepDataDir(true),
200200
))
201-
epc, err := e2e.NewEtcdProcessCluster(context.TODO(), t, e2e.WithConfig(cfg))
202-
assert.NoError(t, err)
201+
epc, err := e2e.NewEtcdProcessCluster(context.TODO(), tb, e2e.WithConfig(cfg))
202+
assert.NoError(tb, err)
203203
return epc
204204
}
205205

206-
func addAndRemoveKeysAndMembers(ctx context.Context, t testing.TB, cc *e2e.EtcdctlV3, snapshotCount uint64) (members []uint64) {
206+
func addAndRemoveKeysAndMembers(ctx context.Context, tb testing.TB, cc *e2e.EtcdctlV3, snapshotCount uint64) (members []uint64) {
207207
// Execute some non-trivial key&member operation
208208
var i uint64
209209
for i = 0; i < snapshotCount*3; i++ {
210210
err := cc.Put(ctx, fmt.Sprintf("%d", i), "1", config.PutOptions{})
211-
require.NoError(t, err)
211+
require.NoError(tb, err)
212212
}
213213
member1, err := cc.MemberAddAsLearner(ctx, "member1", []string{"http://127.0.0.1:2000"})
214-
require.NoError(t, err)
214+
require.NoError(tb, err)
215215
members = append(members, member1.Member.ID)
216216

217217
for i = 0; i < snapshotCount*2; i++ {
218218
_, err = cc.Delete(ctx, fmt.Sprintf("%d", i), config.DeleteOptions{})
219-
require.NoError(t, err)
219+
require.NoError(tb, err)
220220
}
221221
_, err = cc.MemberRemove(ctx, member1.Member.ID)
222-
require.NoError(t, err)
222+
require.NoError(tb, err)
223223

224224
for i = 0; i < snapshotCount; i++ {
225225
err = cc.Put(ctx, fmt.Sprintf("%d", i), "2", config.PutOptions{})
226-
require.NoError(t, err)
226+
require.NoError(tb, err)
227227
}
228228
member2, err := cc.MemberAddAsLearner(ctx, "member2", []string{"http://127.0.0.1:2001"})
229-
require.NoError(t, err)
229+
require.NoError(tb, err)
230230
members = append(members, member2.Member.ID)
231231

232232
for i = 0; i < snapshotCount/2; i++ {
233233
err = cc.Put(ctx, fmt.Sprintf("%d", i), "3", config.PutOptions{})
234-
assert.NoError(t, err)
234+
assert.NoError(tb, err)
235235
}
236236
return members
237237
}
@@ -240,39 +240,39 @@ func filterSnapshotFiles(path string) bool {
240240
return strings.HasSuffix(path, ".snap")
241241
}
242242

243-
func assertSnapshotsMatch(t testing.TB, firstDataDir, secondDataDir string, patch func([]byte) []byte) {
244-
lg := zaptest.NewLogger(t)
243+
func assertSnapshotsMatch(tb testing.TB, firstDataDir, secondDataDir string, patch func([]byte) []byte) {
244+
lg := zaptest.NewLogger(tb)
245245
firstFiles, err := fileutil.ListFiles(firstDataDir, filterSnapshotFiles)
246-
require.NoError(t, err)
246+
require.NoError(tb, err)
247247
secondFiles, err := fileutil.ListFiles(secondDataDir, filterSnapshotFiles)
248-
require.NoError(t, err)
249-
assert.NotEmpty(t, firstFiles)
250-
assert.NotEmpty(t, secondFiles)
251-
assert.Equal(t, len(firstFiles), len(secondFiles))
248+
require.NoError(tb, err)
249+
assert.NotEmpty(tb, firstFiles)
250+
assert.NotEmpty(tb, secondFiles)
251+
assert.Equal(tb, len(firstFiles), len(secondFiles))
252252
sort.Strings(firstFiles)
253253
sort.Strings(secondFiles)
254254
for i := 0; i < len(firstFiles); i++ {
255255
firstSnapshot, err := snap.Read(lg, firstFiles[i])
256-
require.NoError(t, err)
256+
require.NoError(tb, err)
257257
secondSnapshot, err := snap.Read(lg, secondFiles[i])
258-
require.NoError(t, err)
259-
assertMembershipEqual(t, openSnap(patch(firstSnapshot.Data)), openSnap(patch(secondSnapshot.Data)))
258+
require.NoError(tb, err)
259+
assertMembershipEqual(tb, openSnap(patch(firstSnapshot.Data)), openSnap(patch(secondSnapshot.Data)))
260260
}
261261
}
262262

263-
func assertMembershipEqual(t testing.TB, firstStore v2store.Store, secondStore v2store.Store) {
264-
rc1 := membership.NewCluster(zaptest.NewLogger(t))
263+
func assertMembershipEqual(tb testing.TB, firstStore v2store.Store, secondStore v2store.Store) {
264+
rc1 := membership.NewCluster(zaptest.NewLogger(tb))
265265
rc1.SetStore(firstStore)
266266
rc1.Recover(func(lg *zap.Logger, v *semver.Version) {})
267267

268-
rc2 := membership.NewCluster(zaptest.NewLogger(t))
268+
rc2 := membership.NewCluster(zaptest.NewLogger(tb))
269269
rc2.SetStore(secondStore)
270270
rc2.Recover(func(lg *zap.Logger, v *semver.Version) {})
271271

272272
// membership should match
273273
if !reflect.DeepEqual(rc1.Members(), rc2.Members()) {
274-
t.Logf("memberids_from_last_version = %+v, member_ids_from_current_version = %+v", rc1.MemberIDs(), rc2.MemberIDs())
275-
t.Errorf("members_from_last_version_snapshot = %+v, members_from_current_version_snapshot %+v", rc1.Members(), rc2.Members())
274+
tb.Logf("memberids_from_last_version = %+v, member_ids_from_current_version = %+v", rc1.MemberIDs(), rc2.MemberIDs())
275+
tb.Errorf("members_from_last_version_snapshot = %+v, members_from_current_version_snapshot %+v", rc1.Members(), rc2.Members())
276276
}
277277
}
278278

0 commit comments

Comments
 (0)