Skip to content

Commit f7a9be1

Browse files
mmorel-35mmorel-35
committed
chore: enable usetesting
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent dc45df0 commit f7a9be1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+785
-805
lines changed

‎tests/integration/clientv3/cluster_test.go

+24-24
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestMemberList(t *testing.T) {
3737

3838
capi := clus.RandClient()
3939

40-
resp, err := capi.MemberList(context.Background())
40+
resp, err := capi.MemberList(t.Context())
4141
if err != nil {
4242
t.Fatalf("failed to list member %v", err)
4343
}
@@ -56,7 +56,7 @@ func TestMemberAdd(t *testing.T) {
5656
capi := clus.RandClient()
5757

5858
urls := []string{"http://127.0.0.1:1234"}
59-
resp, err := capi.MemberAdd(context.Background(), urls)
59+
resp, err := capi.MemberAdd(t.Context(), urls)
6060
if err != nil {
6161
t.Fatalf("failed to add member %v", err)
6262
}
@@ -74,13 +74,13 @@ func TestMemberAddWithExistingURLs(t *testing.T) {
7474

7575
capi := clus.RandClient()
7676

77-
resp, err := capi.MemberList(context.Background())
77+
resp, err := capi.MemberList(t.Context())
7878
if err != nil {
7979
t.Fatalf("failed to list member %v", err)
8080
}
8181

8282
existingURL := resp.Members[0].PeerURLs[0]
83-
_, err = capi.MemberAdd(context.Background(), []string{existingURL})
83+
_, err = capi.MemberAdd(t.Context(), []string{existingURL})
8484
expectedErrKeywords := "Peer URLs already exists"
8585
if err == nil {
8686
t.Fatalf("expecting add member to fail, got no error")
@@ -97,7 +97,7 @@ func TestMemberRemove(t *testing.T) {
9797
defer clus.Terminate(t)
9898

9999
capi := clus.Client(1)
100-
resp, err := capi.MemberList(context.Background())
100+
resp, err := capi.MemberList(t.Context())
101101
if err != nil {
102102
t.Fatalf("failed to list member %v", err)
103103
}
@@ -113,12 +113,12 @@ func TestMemberRemove(t *testing.T) {
113113
}
114114
}
115115

116-
_, err = capi.MemberRemove(context.Background(), rmvID)
116+
_, err = capi.MemberRemove(t.Context(), rmvID)
117117
if err != nil {
118118
t.Fatalf("failed to remove member %v", err)
119119
}
120120

121-
resp, err = capi.MemberList(context.Background())
121+
resp, err = capi.MemberList(t.Context())
122122
if err != nil {
123123
t.Fatalf("failed to list member %v", err)
124124
}
@@ -135,18 +135,18 @@ func TestMemberUpdate(t *testing.T) {
135135
defer clus.Terminate(t)
136136

137137
capi := clus.RandClient()
138-
resp, err := capi.MemberList(context.Background())
138+
resp, err := capi.MemberList(t.Context())
139139
if err != nil {
140140
t.Fatalf("failed to list member %v", err)
141141
}
142142

143143
urls := []string{"http://127.0.0.1:1234"}
144-
_, err = capi.MemberUpdate(context.Background(), resp.Members[0].ID, urls)
144+
_, err = capi.MemberUpdate(t.Context(), resp.Members[0].ID, urls)
145145
if err != nil {
146146
t.Fatalf("failed to update member %v", err)
147147
}
148148

149-
resp, err = capi.MemberList(context.Background())
149+
resp, err = capi.MemberList(t.Context())
150150
if err != nil {
151151
t.Fatalf("failed to list member %v", err)
152152
}
@@ -178,11 +178,11 @@ func TestMemberAddUpdateWrongURLs(t *testing.T) {
178178
{"localhost:1234"},
179179
}
180180
for i := range tt {
181-
_, err := capi.MemberAdd(context.Background(), tt[i])
181+
_, err := capi.MemberAdd(t.Context(), tt[i])
182182
if err == nil {
183183
t.Errorf("#%d: MemberAdd err = nil, but error", i)
184184
}
185-
_, err = capi.MemberUpdate(context.Background(), 0, tt[i])
185+
_, err = capi.MemberUpdate(t.Context(), 0, tt[i])
186186
if err == nil {
187187
t.Errorf("#%d: MemberUpdate err = nil, but error", i)
188188
}
@@ -198,7 +198,7 @@ func TestMemberAddForLearner(t *testing.T) {
198198
capi := clus.RandClient()
199199

200200
urls := []string{"http://127.0.0.1:1234"}
201-
resp, err := capi.MemberAddAsLearner(context.Background(), urls)
201+
resp, err := capi.MemberAddAsLearner(t.Context(), urls)
202202
if err != nil {
203203
t.Fatalf("failed to add member %v", err)
204204
}
@@ -234,7 +234,7 @@ func TestMemberPromote(t *testing.T) {
234234

235235
learnerMember := clus.MustNewMember(t)
236236
urls := learnerMember.PeerURLs.StringSlice()
237-
memberAddResp, err := capi.MemberAddAsLearner(context.Background(), urls)
237+
memberAddResp, err := capi.MemberAddAsLearner(t.Context(), urls)
238238
if err != nil {
239239
t.Fatalf("failed to add member %v", err)
240240
}
@@ -256,7 +256,7 @@ func TestMemberPromote(t *testing.T) {
256256

257257
// learner is not started yet. Expect learner progress check to fail.
258258
// As the result, member promote request will fail.
259-
_, err = capi.MemberPromote(context.Background(), learnerID)
259+
_, err = capi.MemberPromote(t.Context(), learnerID)
260260
expectedErrKeywords := "can only promote a learner member which is in sync with leader"
261261
if err == nil {
262262
t.Fatalf("expecting promote not ready learner to fail, got no error")
@@ -280,7 +280,7 @@ func TestMemberPromote(t *testing.T) {
280280
t.Fatalf("failed all attempts to promote learner member, last error: %v", err)
281281
}
282282

283-
_, err = capi.MemberPromote(context.Background(), learnerID)
283+
_, err = capi.MemberPromote(t.Context(), learnerID)
284284
// successfully promoted learner
285285
if err == nil {
286286
break
@@ -308,7 +308,7 @@ func TestMemberPromoteMemberNotLearner(t *testing.T) {
308308
followerIdx := (leaderIdx + 1) % 3
309309
cli := clus.Client(followerIdx)
310310

311-
resp, err := cli.MemberList(context.Background())
311+
resp, err := cli.MemberList(t.Context())
312312
if err != nil {
313313
t.Fatalf("failed to list member %v", err)
314314
}
@@ -319,7 +319,7 @@ func TestMemberPromoteMemberNotLearner(t *testing.T) {
319319
// promoting any of the voting members in cluster should fail
320320
expectedErrKeywords := "can only promote a learner member"
321321
for _, m := range resp.Members {
322-
_, err = cli.MemberPromote(context.Background(), m.ID)
322+
_, err = cli.MemberPromote(t.Context(), m.ID)
323323
if err == nil {
324324
t.Fatalf("expect promoting voting member to fail, got no error")
325325
}
@@ -344,7 +344,7 @@ func TestMemberPromoteMemberNotExist(t *testing.T) {
344344
followerIdx := (leaderIdx + 1) % 3
345345
cli := clus.Client(followerIdx)
346346

347-
resp, err := cli.MemberList(context.Background())
347+
resp, err := cli.MemberList(t.Context())
348348
if err != nil {
349349
t.Fatalf("failed to list member %v", err)
350350
}
@@ -369,7 +369,7 @@ func TestMemberPromoteMemberNotExist(t *testing.T) {
369369
}
370370

371371
expectedErrKeywords := "member not found"
372-
_, err = cli.MemberPromote(context.Background(), randID)
372+
_, err = cli.MemberPromote(t.Context(), randID)
373373
if err == nil {
374374
t.Fatalf("expect promoting voting member to fail, got no error")
375375
}
@@ -388,7 +388,7 @@ func TestMaxLearnerInCluster(t *testing.T) {
388388

389389
// 2. adding 2 learner members should succeed
390390
for i := 0; i < 2; i++ {
391-
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
391+
ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)
392392
_, err := clus.Client(0).MemberAddAsLearner(ctx, []string{fmt.Sprintf("http://127.0.0.1:123%d", i)})
393393
cancel()
394394
if err != nil {
@@ -399,7 +399,7 @@ func TestMaxLearnerInCluster(t *testing.T) {
399399
// ensure client endpoint is voting member
400400
leaderIdx := clus.WaitLeader(t)
401401
capi := clus.Client(leaderIdx)
402-
resp1, err := capi.MemberList(context.Background())
402+
resp1, err := capi.MemberList(t.Context())
403403
if err != nil {
404404
t.Fatalf("failed to get member list")
405405
}
@@ -414,7 +414,7 @@ func TestMaxLearnerInCluster(t *testing.T) {
414414
}
415415

416416
// 3. cluster has 3 voting member and 2 learner, adding another learner should fail
417-
_, err = clus.Client(0).MemberAddAsLearner(context.Background(), []string{"http://127.0.0.1:2342"})
417+
_, err = clus.Client(0).MemberAddAsLearner(t.Context(), []string{"http://127.0.0.1:2342"})
418418
if err == nil {
419419
t.Fatalf("expect member add to fail, got no error")
420420
}
@@ -424,7 +424,7 @@ func TestMaxLearnerInCluster(t *testing.T) {
424424
}
425425

426426
// 4. cluster has 3 voting member and 1 learner, adding a voting member should succeed
427-
_, err = clus.Client(0).MemberAdd(context.Background(), []string{"http://127.0.0.1:3453"})
427+
_, err = clus.Client(0).MemberAdd(t.Context(), []string{"http://127.0.0.1:3453"})
428428
if err != nil {
429429
t.Errorf("failed to add member %v", err)
430430
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func TestResumeElection(t *testing.T) {
4545
e := concurrency.NewElection(s, prefix)
4646

4747
// entire test should never take more than 10 seconds
48-
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
48+
ctx, cancel := context.WithTimeout(t.Context(), time.Second*10)
4949
defer cancel()
5050

5151
// become leader

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

+7-8
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package concurrency_test
1616

1717
import (
18-
"context"
1918
"errors"
2019
"testing"
2120

@@ -42,21 +41,21 @@ func TestMutexLockSessionExpired(t *testing.T) {
4241
m2 := concurrency.NewMutex(s2, "/my-lock/")
4342

4443
// acquire lock for s1
45-
require.NoError(t, m1.Lock(context.TODO()))
44+
require.NoError(t, m1.Lock(t.Context()))
4645

4746
m2Locked := make(chan struct{})
4847
var err2 error
4948
go func() {
5049
defer close(m2Locked)
5150
// m2 blocks since m1 already acquired lock /my-lock/
52-
if err2 = m2.Lock(context.TODO()); err2 == nil {
51+
if err2 = m2.Lock(t.Context()); err2 == nil {
5352
t.Error("expect session expired error")
5453
}
5554
}()
5655

5756
// revoke the session of m2 before unlock m1
5857
require.NoError(t, s2.Close())
59-
require.NoError(t, m1.Unlock(context.TODO()))
58+
require.NoError(t, m1.Unlock(t.Context()))
6059

6160
<-m2Locked
6261
}
@@ -71,17 +70,17 @@ func TestMutexUnlock(t *testing.T) {
7170
defer s1.Close()
7271

7372
m1 := concurrency.NewMutex(s1, "/my-lock/")
74-
err = m1.Unlock(context.TODO())
73+
err = m1.Unlock(t.Context())
7574
require.Errorf(t, err, "expect lock released error")
7675
if !errors.Is(err, concurrency.ErrLockReleased) {
7776
t.Fatal(err)
7877
}
7978

80-
require.NoError(t, m1.Lock(context.TODO()))
79+
require.NoError(t, m1.Lock(t.Context()))
8180

82-
require.NoError(t, m1.Unlock(context.TODO()))
81+
require.NoError(t, m1.Unlock(t.Context()))
8382

84-
err = m1.Unlock(context.TODO())
83+
err = m1.Unlock(t.Context())
8584
if err == nil {
8685
t.Fatal("expect lock released error")
8786
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestSessionOptions(t *testing.T) {
3131
cli, err := integration2.NewClient(t, clientv3.Config{Endpoints: exampleEndpoints()})
3232
require.NoError(t, err)
3333
defer cli.Close()
34-
lease, err := cli.Grant(context.Background(), 100)
34+
lease, err := cli.Grant(t.Context(), 100)
3535
require.NoError(t, err)
3636
s, err := concurrency.NewSession(cli, concurrency.WithLease(lease.ID))
3737
require.NoError(t, err)
@@ -58,7 +58,7 @@ func TestSessionTTLOptions(t *testing.T) {
5858

5959
leaseID := s.Lease()
6060
// TTL retrieved should be less than the set TTL, but not equal to default:60 or exprired:-1
61-
resp, err := cli.Lease.TimeToLive(context.Background(), leaseID)
61+
resp, err := cli.Lease.TimeToLive(t.Context(), leaseID)
6262
if err != nil {
6363
t.Log(err)
6464
}
@@ -77,7 +77,7 @@ func TestSessionCtx(t *testing.T) {
7777
cli, err := integration2.NewClient(t, clientv3.Config{Endpoints: exampleEndpoints()})
7878
require.NoError(t, err)
7979
defer cli.Close()
80-
lease, err := cli.Grant(context.Background(), 100)
80+
lease, err := cli.Grant(t.Context(), 100)
8181
require.NoError(t, err)
8282
s, err := concurrency.NewSession(cli, concurrency.WithLease(lease.ID))
8383
require.NoError(t, err)

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func TestBalancerUnderBlackholeKeepAliveWatch(t *testing.T) {
6666
require.NoError(t, err)
6767
defer cli.Close()
6868

69-
wch := cli.Watch(context.Background(), "foo", clientv3.WithCreatedNotify())
69+
wch := cli.Watch(t.Context(), "foo", clientv3.WithCreatedNotify())
7070
if _, ok := <-wch; !ok {
7171
t.Fatalf("watch failed on creation")
7272
}
@@ -79,7 +79,7 @@ func TestBalancerUnderBlackholeKeepAliveWatch(t *testing.T) {
7979

8080
clus.Members[0].Bridge().Blackhole()
8181

82-
_, err = clus.Client(1).Put(context.TODO(), "foo", "bar")
82+
_, err = clus.Client(1).Put(t.Context(), "foo", "bar")
8383
require.NoError(t, err)
8484
select {
8585
case <-wch:
@@ -95,9 +95,9 @@ func TestBalancerUnderBlackholeKeepAliveWatch(t *testing.T) {
9595
clus.Members[1].Bridge().Blackhole()
9696

9797
// make sure client[0] can connect to eps[0] after remove the blackhole.
98-
_, err = clus.Client(0).Get(context.TODO(), "foo")
98+
_, err = clus.Client(0).Get(t.Context(), "foo")
9999
require.NoError(t, err)
100-
_, err = clus.Client(0).Put(context.TODO(), "foo", "bar1")
100+
_, err = clus.Client(0).Put(t.Context(), "foo", "bar1")
101101
require.NoError(t, err)
102102

103103
select {
@@ -197,7 +197,7 @@ func testBalancerUnderBlackholeNoKeepAlive(t *testing.T, op func(*clientv3.Clien
197197
// TODO: first operation can succeed
198198
// when gRPC supports better retry on non-delivered request
199199
for i := 0; i < 5; i++ {
200-
ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
200+
ctx, cancel := context.WithTimeout(t.Context(), time.Second*5)
201201
err = op(cli, ctx)
202202
cancel()
203203
if err == nil {

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ func testDialSetEndpoints(t *testing.T, setBefore bool) {
133133
cli.SetEndpoints(eps[toKill%3], eps[(toKill+1)%3])
134134
}
135135
time.Sleep(time.Second * 2)
136-
ctx, cancel := context.WithTimeout(context.Background(), integration2.RequestWaitTimeout)
136+
ctx, cancel := context.WithTimeout(t.Context(), integration2.RequestWaitTimeout)
137137
_, err = cli.Get(ctx, "foo", clientv3.WithSerializable())
138138
require.NoError(t, err)
139139
cancel()
@@ -154,7 +154,7 @@ func TestSwitchSetEndpoints(t *testing.T) {
154154

155155
cli.SetEndpoints(eps...)
156156

157-
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
157+
ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
158158
defer cancel()
159159
_, err := cli.Get(ctx, "foo")
160160
require.NoError(t, err)
@@ -191,7 +191,7 @@ func TestDialForeignEndpoint(t *testing.T) {
191191
// grpc can return a lazy connection that's not connected yet; confirm
192192
// that it can communicate with the cluster.
193193
kvc := clientv3.NewKVFromKVClient(pb.NewKVClient(conn), clus.Client(0))
194-
ctx, cancel := context.WithTimeout(context.TODO(), 5*time.Second)
194+
ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)
195195
defer cancel()
196196
_, gerr := kvc.Get(ctx, "abc")
197197
require.NoError(t, gerr)
@@ -205,7 +205,7 @@ func TestSetEndpointAndPut(t *testing.T) {
205205
defer clus.Terminate(t)
206206

207207
clus.Client(1).SetEndpoints(clus.Members[0].GRPCURL)
208-
_, err := clus.Client(1).Put(context.TODO(), "foo", "bar")
208+
_, err := clus.Client(1).Put(t.Context(), "foo", "bar")
209209
if err != nil && !strings.Contains(err.Error(), "closing") {
210210
t.Fatal(err)
211211
}

0 commit comments

Comments
 (0)