Skip to content

Commit 57633bc

Browse files
ElbeheryElbehery
committed
chore(test): address Go usetesting for v3_auth_test
Signed-off-by: Mustafa Elbehery <[email protected]>
1 parent f23c9d7 commit 57633bc

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

‎tests/integration/v3_auth_test.go

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestV3AuthEmptyUserGet(t *testing.T) {
3737
clus := integration.NewCluster(t, &integration.ClusterConfig{Size: 1})
3838
defer clus.Terminate(t)
3939

40-
ctx, cancel := context.WithTimeout(context.TODO(), 30*time.Second)
40+
ctx, cancel := context.WithTimeout(t.Context(), 30*time.Second)
4141
defer cancel()
4242

4343
api := integration.ToGRPC(clus.Client(0))
@@ -57,7 +57,7 @@ func TestV3AuthEmptyUserPut(t *testing.T) {
5757
})
5858
defer clus.Terminate(t)
5959

60-
ctx, cancel := context.WithTimeout(context.TODO(), 30*time.Second)
60+
ctx, cancel := context.WithTimeout(t.Context(), 30*time.Second)
6161
defer cancel()
6262

6363
api := integration.ToGRPC(clus.Client(0))
@@ -85,7 +85,7 @@ func TestV3AuthTokenWithDisable(t *testing.T) {
8585
require.NoError(t, cerr)
8686
defer c.Close()
8787

88-
rctx, cancel := context.WithCancel(context.TODO())
88+
rctx, cancel := context.WithCancel(t.Context())
8989
donec := make(chan struct{})
9090
go func() {
9191
defer close(donec)
@@ -95,7 +95,7 @@ func TestV3AuthTokenWithDisable(t *testing.T) {
9595
}()
9696

9797
time.Sleep(10 * time.Millisecond)
98-
_, err := c.AuthDisable(context.TODO())
98+
_, err := c.AuthDisable(t.Context())
9999
require.NoError(t, err)
100100
time.Sleep(10 * time.Millisecond)
101101

@@ -110,13 +110,13 @@ func TestV3AuthRevision(t *testing.T) {
110110

111111
api := integration.ToGRPC(clus.Client(0))
112112

113-
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
113+
ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)
114114
presp, perr := api.KV.Put(ctx, &pb.PutRequest{Key: []byte("foo"), Value: []byte("bar")})
115115
cancel()
116116
require.NoError(t, perr)
117117
rev := presp.Header.Revision
118118

119-
ctx, cancel = context.WithTimeout(context.Background(), 5*time.Second)
119+
ctx, cancel = context.WithTimeout(t.Context(), 5*time.Second)
120120
aresp, aerr := api.Auth.UserAdd(ctx, &pb.AuthUserAddRequest{Name: "root", Password: "123", Options: &authpb.UserAddOptions{NoPassword: false}})
121121
cancel()
122122
require.NoError(t, aerr)
@@ -152,18 +152,18 @@ func testV3AuthWithLeaseRevokeWithRoot(t *testing.T, ccfg integration.ClusterCon
152152
require.NoError(t, cerr)
153153
defer rootc.Close()
154154

155-
leaseResp, err := rootc.Grant(context.TODO(), 2)
155+
leaseResp, err := rootc.Grant(t.Context(), 2)
156156
require.NoError(t, err)
157157
leaseID := leaseResp.ID
158158

159-
_, err = rootc.Put(context.TODO(), "foo", "bar", clientv3.WithLease(leaseID))
159+
_, err = rootc.Put(t.Context(), "foo", "bar", clientv3.WithLease(leaseID))
160160
require.NoError(t, err)
161161

162162
// wait for lease expire
163163
time.Sleep(3 * time.Second)
164164

165165
tresp, terr := rootc.TimeToLive(
166-
context.TODO(),
166+
t.Context(),
167167
leaseID,
168168
clientv3.WithAttachedKeys(),
169169
)
@@ -208,17 +208,17 @@ func TestV3AuthWithLeaseRevoke(t *testing.T) {
208208
require.NoError(t, cerr)
209209
defer rootc.Close()
210210

211-
leaseResp, err := rootc.Grant(context.TODO(), 90)
211+
leaseResp, err := rootc.Grant(t.Context(), 90)
212212
require.NoError(t, err)
213213
leaseID := leaseResp.ID
214214
// permission of k3 isn't granted to user1
215-
_, err = rootc.Put(context.TODO(), "k3", "val", clientv3.WithLease(leaseID))
215+
_, err = rootc.Put(t.Context(), "k3", "val", clientv3.WithLease(leaseID))
216216
require.NoError(t, err)
217217

218218
userc, cerr := integration.NewClient(t, clientv3.Config{Endpoints: clus.Client(0).Endpoints(), Username: "user1", Password: "user1-123"})
219219
require.NoError(t, cerr)
220220
defer userc.Close()
221-
_, err = userc.Revoke(context.TODO(), leaseID)
221+
_, err = userc.Revoke(t.Context(), leaseID)
222222
if err == nil {
223223
t.Fatal("revoking from user1 should be failed with permission denied")
224224
}
@@ -257,36 +257,36 @@ func TestV3AuthWithLeaseAttach(t *testing.T) {
257257
require.NoError(t, cerr)
258258
defer user2c.Close()
259259

260-
leaseResp, err := user1c.Grant(context.TODO(), 90)
260+
leaseResp, err := user1c.Grant(t.Context(), 90)
261261
require.NoError(t, err)
262262
leaseID := leaseResp.ID
263263
// permission of k2 is also granted to user2
264-
_, err = user1c.Put(context.TODO(), "k2", "val", clientv3.WithLease(leaseID))
264+
_, err = user1c.Put(t.Context(), "k2", "val", clientv3.WithLease(leaseID))
265265
require.NoError(t, err)
266266

267-
_, err = user2c.Revoke(context.TODO(), leaseID)
267+
_, err = user2c.Revoke(t.Context(), leaseID)
268268
require.NoError(t, err)
269269

270-
leaseResp, err = user1c.Grant(context.TODO(), 90)
270+
leaseResp, err = user1c.Grant(t.Context(), 90)
271271
require.NoError(t, err)
272272
leaseID = leaseResp.ID
273273
// permission of k1 isn't granted to user2
274-
_, err = user1c.Put(context.TODO(), "k1", "val", clientv3.WithLease(leaseID))
274+
_, err = user1c.Put(t.Context(), "k1", "val", clientv3.WithLease(leaseID))
275275
require.NoError(t, err)
276276

277-
_, err = user2c.Revoke(context.TODO(), leaseID)
277+
_, err = user2c.Revoke(t.Context(), leaseID)
278278
if err == nil {
279279
t.Fatal("revoking from user2 should be failed with permission denied")
280280
}
281281
}
282282

283283
func authSetupUsers(t *testing.T, auth pb.AuthClient, users []user) {
284284
for _, user := range users {
285-
_, err := auth.UserAdd(context.TODO(), &pb.AuthUserAddRequest{Name: user.name, Password: user.password, Options: &authpb.UserAddOptions{NoPassword: false}})
285+
_, err := auth.UserAdd(t.Context(), &pb.AuthUserAddRequest{Name: user.name, Password: user.password, Options: &authpb.UserAddOptions{NoPassword: false}})
286286
require.NoError(t, err)
287-
_, err = auth.RoleAdd(context.TODO(), &pb.AuthRoleAddRequest{Name: user.role})
287+
_, err = auth.RoleAdd(t.Context(), &pb.AuthRoleAddRequest{Name: user.role})
288288
require.NoError(t, err)
289-
_, err = auth.UserGrantRole(context.TODO(), &pb.AuthUserGrantRoleRequest{User: user.name, Role: user.role})
289+
_, err = auth.UserGrantRole(t.Context(), &pb.AuthUserGrantRoleRequest{User: user.name, Role: user.role})
290290
require.NoError(t, err)
291291

292292
if len(user.key) == 0 {
@@ -298,7 +298,7 @@ func authSetupUsers(t *testing.T, auth pb.AuthClient, users []user) {
298298
Key: []byte(user.key),
299299
RangeEnd: []byte(user.end),
300300
}
301-
_, err = auth.RoleGrantPermission(context.TODO(), &pb.AuthRoleGrantPermissionRequest{Name: user.role, Perm: perm})
301+
_, err = auth.RoleGrantPermission(t.Context(), &pb.AuthRoleGrantPermissionRequest{Name: user.role, Perm: perm})
302302
require.NoError(t, err)
303303
}
304304
}
@@ -313,7 +313,7 @@ func authSetupRoot(t *testing.T, auth pb.AuthClient) {
313313
},
314314
}
315315
authSetupUsers(t, auth, root)
316-
_, err := auth.AuthEnable(context.TODO(), &pb.AuthEnableRequest{})
316+
_, err := auth.AuthEnable(t.Context(), &pb.AuthEnableRequest{})
317317
require.NoError(t, err)
318318
}
319319

@@ -326,12 +326,12 @@ func TestV3AuthNonAuthorizedRPCs(t *testing.T) {
326326

327327
key := "foo"
328328
val := "bar"
329-
_, err := nonAuthedKV.Put(context.TODO(), key, val)
329+
_, err := nonAuthedKV.Put(t.Context(), key, val)
330330
require.NoErrorf(t, err, "couldn't put key (%v)", err)
331331

332332
authSetupRoot(t, integration.ToGRPC(clus.Client(0)).Auth)
333333

334-
respput, err := nonAuthedKV.Put(context.TODO(), key, val)
334+
respput, err := nonAuthedKV.Put(t.Context(), key, val)
335335
require.Truef(t, eqErrGRPC(err, rpctypes.ErrGRPCUserEmpty), "could put key (%v), it should cause an error of permission denied", respput)
336336
}
337337

@@ -355,13 +355,13 @@ func TestV3AuthOldRevConcurrent(t *testing.T) {
355355
f := func(i int) {
356356
defer wg.Done()
357357
role, user := fmt.Sprintf("test-role-%d", i), fmt.Sprintf("test-user-%d", i)
358-
_, err := c.RoleAdd(context.TODO(), role)
358+
_, err := c.RoleAdd(t.Context(), role)
359359
require.NoError(t, err)
360-
_, err = c.RoleGrantPermission(context.TODO(), role, "\x00", clientv3.GetPrefixRangeEnd(""), clientv3.PermissionType(clientv3.PermReadWrite))
360+
_, err = c.RoleGrantPermission(t.Context(), role, "\x00", clientv3.GetPrefixRangeEnd(""), clientv3.PermissionType(clientv3.PermReadWrite))
361361
require.NoError(t, err)
362-
_, err = c.UserAdd(context.TODO(), user, "123")
362+
_, err = c.UserAdd(t.Context(), user, "123")
363363
require.NoError(t, err)
364-
_, err = c.Put(context.TODO(), "a", "b")
364+
_, err = c.Put(t.Context(), "a", "b")
365365
assert.NoError(t, err)
366366
}
367367
// needs concurrency to trigger
@@ -378,7 +378,7 @@ func TestV3AuthWatchErrorAndWatchId0(t *testing.T) {
378378
clus := integration.NewCluster(t, &integration.ClusterConfig{Size: 1})
379379
defer clus.Terminate(t)
380380

381-
ctx, cancel := context.WithTimeout(context.TODO(), 10*time.Second)
381+
ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
382382
defer cancel()
383383

384384
users := []user{

0 commit comments

Comments
 (0)