mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19590 from mmorel-35/usetesting/server

Browse Source 
server: address Go 1.24 usetesting issues
This commit is contained in:
Benjamin Wang 2025-03-14 09:24:35 +00:00 committed by GitHub
commit 8b4c2cc11e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 70 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/auth/jwt_test.go
View File

@ -15,7 +15,6 @@
package auth package auth
import ( import (
"context"
"fmt" "fmt"
"maps" "maps"
"testing" "testing"
@ -96,7 +95,7 @@ func testJWTInfo(t *testing.T, opts map[string]string) {
t.Fatal(err) t.Fatal(err)
} }
ctx := context.TODO() ctx := t.Context()
token, aerr := jwt.assign(ctx, "abc", 123) token, aerr := jwt.assign(ctx, "abc", 123)
if aerr != nil { if aerr != nil {
@ -196,7 +195,7 @@ func TestJWTTokenWithMissingFields(t *testing.T) {
// verify the token // verify the token
jwtProvider, err := newTokenProviderJWT(zap.NewNop(), optsMap) jwtProvider, err := newTokenProviderJWT(zap.NewNop(), optsMap)
require.NoError(t, err) require.NoError(t, err)
ai, ok := jwtProvider.info(context.TODO(), token, 123) ai, ok := jwtProvider.info(t.Context(), token, 123)
require.Equal(t, tc.expectValid, ok) require.Equal(t, tc.expectValid, ok)
if ok { if ok {

6
server/auth/simple_token_test.go
View File

@ -31,7 +31,7 @@ func TestSimpleTokenDisabled(t *testing.T) {
explicitlyDisabled.disable() explicitlyDisabled.disable()
for _, tp := range []*tokenSimple{initialState, explicitlyDisabled} { for _, tp := range []*tokenSimple{initialState, explicitlyDisabled} {
ctx := context.WithValue(context.WithValue(context.TODO(), AuthenticateParamIndex{}, uint64(1)), AuthenticateParamSimpleTokenPrefix{}, "dummy") ctx := context.WithValue(context.WithValue(t.Context(), AuthenticateParamIndex{}, uint64(1)), AuthenticateParamSimpleTokenPrefix{}, "dummy")
token, err := tp.assign(ctx, "user1", 0) token, err := tp.assign(ctx, "user1", 0)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -51,7 +51,7 @@ func TestSimpleTokenAssign(t *testing.T) {
tp := newTokenProviderSimple(zaptest.NewLogger(t), dummyIndexWaiter, simpleTokenTTLDefault) tp := newTokenProviderSimple(zaptest.NewLogger(t), dummyIndexWaiter, simpleTokenTTLDefault)
tp.enable() tp.enable()
defer tp.disable() defer tp.disable()
ctx := context.WithValue(context.WithValue(context.TODO(), AuthenticateParamIndex{}, uint64(1)), AuthenticateParamSimpleTokenPrefix{}, "dummy") ctx := context.WithValue(context.WithValue(t.Context(), AuthenticateParamIndex{}, uint64(1)), AuthenticateParamSimpleTokenPrefix{}, "dummy")
token, err := tp.assign(ctx, "user1", 0) token, err := tp.assign(ctx, "user1", 0)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -63,7 +63,7 @@ func TestSimpleTokenAssign(t *testing.T) {
tp.invalidateUser("user1") tp.invalidateUser("user1")
_, ok = tp.info(context.TODO(), token, 0) _, ok = tp.info(t.Context(), token, 0)
if ok { if ok {
t.Errorf("expected ok == false after user is invalidated") t.Errorf("expected ok == false after user is invalidated")
} }

32
server/auth/store_test.go
View File

@ -280,7 +280,7 @@ func TestUserChangePassword(t *testing.T) {
as, tearDown := setupAuthStore(t) as, tearDown := setupAuthStore(t)
defer tearDown(t) defer tearDown(t)
ctx1 := context.WithValue(context.WithValue(context.TODO(), AuthenticateParamIndex{}, uint64(1)), AuthenticateParamSimpleTokenPrefix{}, "dummy") ctx1 := context.WithValue(context.WithValue(t.Context(), AuthenticateParamIndex{}, uint64(1)), AuthenticateParamSimpleTokenPrefix{}, "dummy")
_, err := as.Authenticate(ctx1, "foo", "bar") _, err := as.Authenticate(ctx1, "foo", "bar")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -291,7 +291,7 @@ func TestUserChangePassword(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
ctx2 := context.WithValue(context.WithValue(context.TODO(), AuthenticateParamIndex{}, uint64(2)), AuthenticateParamSimpleTokenPrefix{}, "dummy") ctx2 := context.WithValue(context.WithValue(t.Context(), AuthenticateParamIndex{}, uint64(2)), AuthenticateParamSimpleTokenPrefix{}, "dummy")
_, err = as.Authenticate(ctx2, "foo", "baz") _, err = as.Authenticate(ctx2, "foo", "baz")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -811,38 +811,38 @@ func TestAuthInfoFromCtx(t *testing.T) {
as, tearDown := setupAuthStore(t) as, tearDown := setupAuthStore(t)
defer tearDown(t) defer tearDown(t)
ctx := context.Background() ctx := t.Context()
ai, err := as.AuthInfoFromCtx(ctx) ai, err := as.AuthInfoFromCtx(ctx)
if err != nil && ai != nil { if err != nil && ai != nil {
t.Errorf("expected (nil, nil), got (%v, %v)", ai, err) t.Errorf("expected (nil, nil), got (%v, %v)", ai, err)
} }
// as if it came from RPC // as if it came from RPC
ctx = metadata.NewIncomingContext(context.Background(), metadata.New(map[string]string{"tokens": "dummy"})) ctx = metadata.NewIncomingContext(t.Context(), metadata.New(map[string]string{"tokens": "dummy"}))
ai, err = as.AuthInfoFromCtx(ctx) ai, err = as.AuthInfoFromCtx(ctx)
if err != nil && ai != nil { if err != nil && ai != nil {
t.Errorf("expected (nil, nil), got (%v, %v)", ai, err) t.Errorf("expected (nil, nil), got (%v, %v)", ai, err)
} }
ctx = context.WithValue(context.WithValue(context.TODO(), AuthenticateParamIndex{}, uint64(1)), AuthenticateParamSimpleTokenPrefix{}, "dummy") ctx = context.WithValue(context.WithValue(t.Context(), AuthenticateParamIndex{}, uint64(1)), AuthenticateParamSimpleTokenPrefix{}, "dummy")
resp, err := as.Authenticate(ctx, "foo", "bar") resp, err := as.Authenticate(ctx, "foo", "bar")
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
ctx = metadata.NewIncomingContext(context.Background(), metadata.New(map[string]string{rpctypes.TokenFieldNameGRPC: "Invalid Token"})) ctx = metadata.NewIncomingContext(t.Context(), metadata.New(map[string]string{rpctypes.TokenFieldNameGRPC: "Invalid Token"}))
_, err = as.AuthInfoFromCtx(ctx) _, err = as.AuthInfoFromCtx(ctx)
if !errors.Is(err, ErrInvalidAuthToken) { if !errors.Is(err, ErrInvalidAuthToken) {
t.Errorf("expected %v, got %v", ErrInvalidAuthToken, err) t.Errorf("expected %v, got %v", ErrInvalidAuthToken, err)
} }
ctx = metadata.NewIncomingContext(context.Background(), metadata.New(map[string]string{rpctypes.TokenFieldNameGRPC: "Invalid.Token"})) ctx = metadata.NewIncomingContext(t.Context(), metadata.New(map[string]string{rpctypes.TokenFieldNameGRPC: "Invalid.Token"}))
_, err = as.AuthInfoFromCtx(ctx) _, err = as.AuthInfoFromCtx(ctx)
if !errors.Is(err, ErrInvalidAuthToken) { if !errors.Is(err, ErrInvalidAuthToken) {
t.Errorf("expected %v, got %v", ErrInvalidAuthToken, err) t.Errorf("expected %v, got %v", ErrInvalidAuthToken, err)
} }
ctx = metadata.NewIncomingContext(context.Background(), metadata.New(map[string]string{rpctypes.TokenFieldNameGRPC: resp.Token})) ctx = metadata.NewIncomingContext(t.Context(), metadata.New(map[string]string{rpctypes.TokenFieldNameGRPC: resp.Token}))
ai, err = as.AuthInfoFromCtx(ctx) ai, err = as.AuthInfoFromCtx(ctx)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
@ -857,7 +857,7 @@ func TestAuthDisable(t *testing.T) {
defer tearDown(t) defer tearDown(t)
as.AuthDisable() as.AuthDisable()
ctx := context.WithValue(context.WithValue(context.TODO(), AuthenticateParamIndex{}, uint64(2)), AuthenticateParamSimpleTokenPrefix{}, "dummy") ctx := context.WithValue(context.WithValue(t.Context(), AuthenticateParamIndex{}, uint64(2)), AuthenticateParamSimpleTokenPrefix{}, "dummy")
_, err := as.Authenticate(ctx, "foo", "bar") _, err := as.Authenticate(ctx, "foo", "bar")
if !errors.Is(err, ErrAuthNotEnabled) { if !errors.Is(err, ErrAuthNotEnabled) {
t.Errorf("expected %v, got %v", ErrAuthNotEnabled, err) t.Errorf("expected %v, got %v", ErrAuthNotEnabled, err)
@ -879,7 +879,7 @@ func TestIsAuthEnabled(t *testing.T) {
as.AuthEnable() as.AuthEnable()
status := as.IsAuthEnabled() status := as.IsAuthEnabled()
ctx := context.WithValue(context.WithValue(context.TODO(), AuthenticateParamIndex{}, uint64(2)), AuthenticateParamSimpleTokenPrefix{}, "dummy") ctx := context.WithValue(context.WithValue(t.Context(), AuthenticateParamIndex{}, uint64(2)), AuthenticateParamSimpleTokenPrefix{}, "dummy")
_, _ = as.Authenticate(ctx, "foo", "bar") _, _ = as.Authenticate(ctx, "foo", "bar")
if status != true { if status != true {
t.Errorf("expected %v, got %v", true, false) t.Errorf("expected %v, got %v", true, false)
@ -907,7 +907,7 @@ func TestAuthInfoFromCtxRace(t *testing.T) {
donec := make(chan struct{}) donec := make(chan struct{})
go func() { go func() {
defer close(donec) defer close(donec)
ctx := metadata.NewIncomingContext(context.Background(), metadata.New(map[string]string{rpctypes.TokenFieldNameGRPC: "test"})) ctx := metadata.NewIncomingContext(t.Context(), metadata.New(map[string]string{rpctypes.TokenFieldNameGRPC: "test"}))
as.AuthInfoFromCtx(ctx) as.AuthInfoFromCtx(ctx)
}() }()
as.UserAdd(&pb.AuthUserAddRequest{Name: "test", Options: &authpb.UserAddOptions{NoPassword: false}}) as.UserAdd(&pb.AuthUserAddRequest{Name: "test", Options: &authpb.UserAddOptions{NoPassword: false}})
@ -1025,7 +1025,7 @@ func TestHammerSimpleAuthenticate(t *testing.T) {
go func(user string) { go func(user string) {
defer wg.Done() defer wg.Done()
token := fmt.Sprintf("%s(%d)", user, i) token := fmt.Sprintf("%s(%d)", user, i)
ctx := context.WithValue(context.WithValue(context.TODO(), AuthenticateParamIndex{}, uint64(1)), AuthenticateParamSimpleTokenPrefix{}, token) ctx := context.WithValue(context.WithValue(t.Context(), AuthenticateParamIndex{}, uint64(1)), AuthenticateParamSimpleTokenPrefix{}, token)
if _, err := as.Authenticate(ctx, user, "123"); err != nil { if _, err := as.Authenticate(ctx, user, "123"); err != nil {
t.Error(err) t.Error(err)
} }
@ -1106,7 +1106,7 @@ func testAuthInfoFromCtxWithRoot(t *testing.T, opts string) {
t.Fatal(err) t.Fatal(err)
} }
ctx := context.Background() ctx := t.Context()
ctx = as.WithRoot(ctx) ctx = as.WithRoot(ctx)
ai, aerr := as.AuthInfoFromCtx(ctx) ai, aerr := as.AuthInfoFromCtx(ctx)
@ -1130,7 +1130,7 @@ func TestUserNoPasswordAdd(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
ctx := context.WithValue(context.WithValue(context.TODO(), AuthenticateParamIndex{}, uint64(1)), AuthenticateParamSimpleTokenPrefix{}, "dummy") ctx := context.WithValue(context.WithValue(t.Context(), AuthenticateParamIndex{}, uint64(1)), AuthenticateParamSimpleTokenPrefix{}, "dummy")
_, err = as.Authenticate(ctx, username, "") _, err = as.Authenticate(ctx, username, "")
require.ErrorIsf(t, err, ErrAuthFailed, "expected %v, got %v", ErrAuthFailed, err) require.ErrorIsf(t, err, ErrAuthFailed, "expected %v, got %v", ErrAuthFailed, err)
} }
@ -1150,7 +1150,7 @@ func TestUserChangePasswordWithOldLog(t *testing.T) {
as, tearDown := setupAuthStore(t) as, tearDown := setupAuthStore(t)
defer tearDown(t) defer tearDown(t)
ctx1 := context.WithValue(context.WithValue(context.TODO(), AuthenticateParamIndex{}, uint64(1)), AuthenticateParamSimpleTokenPrefix{}, "dummy") ctx1 := context.WithValue(context.WithValue(t.Context(), AuthenticateParamIndex{}, uint64(1)), AuthenticateParamSimpleTokenPrefix{}, "dummy")
_, err := as.Authenticate(ctx1, "foo", "bar") _, err := as.Authenticate(ctx1, "foo", "bar")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -1161,7 +1161,7 @@ func TestUserChangePasswordWithOldLog(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
ctx2 := context.WithValue(context.WithValue(context.TODO(), AuthenticateParamIndex{}, uint64(2)), AuthenticateParamSimpleTokenPrefix{}, "dummy") ctx2 := context.WithValue(context.WithValue(t.Context(), AuthenticateParamIndex{}, uint64(2)), AuthenticateParamSimpleTokenPrefix{}, "dummy")
_, err = as.Authenticate(ctx2, "foo", "baz") _, err = as.Authenticate(ctx2, "foo", "baz")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)

9
server/embed/auth_test.go
View File

@ -15,7 +15,6 @@
package embed package embed
import ( import (
"context"
"testing" "testing"
"go.etcd.io/etcd/server/v3/etcdserver/api/v3client" "go.etcd.io/etcd/server/v3/etcdserver/api/v3client"
@ -33,19 +32,19 @@ func TestEnableAuth(t *testing.T) {
client := v3client.New(e.Server) client := v3client.New(e.Server)
defer client.Close() defer client.Close()
_, err = client.RoleAdd(context.TODO(), "root") _, err = client.RoleAdd(t.Context(), "root")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
_, err = client.UserAdd(context.TODO(), "root", "root") _, err = client.UserAdd(t.Context(), "root", "root")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
_, err = client.UserGrantRole(context.TODO(), "root", "root") _, err = client.UserGrantRole(t.Context(), "root", "root")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
_, err = client.AuthEnable(context.TODO()) _, err = client.AuthEnable(t.Context())
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

7
server/etcdserver/api/rafthttp/stream_test.go
View File

@ -15,7 +15,6 @@
package rafthttp package rafthttp
import ( import (
"context"
"errors" "errors"
"io" "io"
"net/http" "net/http"
@ -116,7 +115,7 @@ func TestStreamReaderDialRequest(t *testing.T) {
peerID: types.ID(2), peerID: types.ID(2),
tr: &Transport{streamRt: tr, ClusterID: types.ID(1), ID: types.ID(1)}, tr: &Transport{streamRt: tr, ClusterID: types.ID(1), ID: types.ID(1)},
picker: mustNewURLPicker(t, []string{"http://localhost:2380"}), picker: mustNewURLPicker(t, []string{"http://localhost:2380"}),
ctx: context.Background(), ctx: t.Context(),
} }
sr.dial(tt) sr.dial(tt)
@ -171,7 +170,7 @@ func TestStreamReaderDialResult(t *testing.T) {
tr: &Transport{streamRt: tr, ClusterID: types.ID(1)}, tr: &Transport{streamRt: tr, ClusterID: types.ID(1)},
picker: mustNewURLPicker(t, []string{"http://localhost:2380"}), picker: mustNewURLPicker(t, []string{"http://localhost:2380"}),
errorc: make(chan error, 1), errorc: make(chan error, 1),
ctx: context.Background(), ctx: t.Context(),
} }
_, err := sr.dial(streamTypeMessage) _, err := sr.dial(streamTypeMessage)
@ -253,7 +252,7 @@ func TestStreamReaderDialDetectUnsupport(t *testing.T) {
peerID: types.ID(2), peerID: types.ID(2),
tr: &Transport{streamRt: tr, ClusterID: types.ID(1)}, tr: &Transport{streamRt: tr, ClusterID: types.ID(1)},
picker: mustNewURLPicker(t, []string{"http://localhost:2380"}), picker: mustNewURLPicker(t, []string{"http://localhost:2380"}),
ctx: context.Background(), ctx: t.Context(),
} }
_, err := sr.dial(typ) _, err := sr.dial(typ)

2
server/etcdserver/api/v3rpc/validationfuzz_test.go
View File

@ -168,7 +168,7 @@ func execTransaction(t *testing.T, req *pb.RequestOp) {
defer s.Close() defer s.Close()
// setup cancelled context // setup cancelled context
ctx, cancel := context.WithCancel(context.TODO()) ctx, cancel := context.WithCancel(t.Context())
cancel() cancel()
request := &pb.TxnRequest{ request := &pb.TxnRequest{

16
server/etcdserver/server_test.go
View File

@ -986,7 +986,7 @@ func TestAddMember(t *testing.T) {
} }
s.start() s.start()
m := membership.Member{ID: 1234, RaftAttributes: membership.RaftAttributes{PeerURLs: []string{"foo"}}} m := membership.Member{ID: 1234, RaftAttributes: membership.RaftAttributes{PeerURLs: []string{"foo"}}}
_, err := s.AddMember(context.Background(), m) _, err := s.AddMember(t.Context(), m)
gaction := n.Action() gaction := n.Action()
s.Stop() s.Stop()
@ -1052,7 +1052,7 @@ func TestProcessIgnoreMismatchMessage(t *testing.T) {
if types.ID(m.To) == s.MemberID() { if types.ID(m.To) == s.MemberID() {
t.Fatalf("m.To (%d) is expected to mismatch s.MemberID (%d)", m.To, s.MemberID()) t.Fatalf("m.To (%d) is expected to mismatch s.MemberID (%d)", m.To, s.MemberID())
} }
err := s.Process(context.Background(), m) err := s.Process(t.Context(), m)
if err == nil { if err == nil {
t.Fatalf("Must ignore the message and return an error") t.Fatalf("Must ignore the message and return an error")
} }
@ -1092,7 +1092,7 @@ func TestRemoveMember(t *testing.T) {
beHooks: serverstorage.NewBackendHooks(lg, nil), beHooks: serverstorage.NewBackendHooks(lg, nil),
} }
s.start() s.start()
_, err := s.RemoveMember(context.Background(), 1234) _, err := s.RemoveMember(t.Context(), 1234)
gaction := n.Action() gaction := n.Action()
s.Stop() s.Stop()
@ -1142,7 +1142,7 @@ func TestUpdateMember(t *testing.T) {
} }
s.start() s.start()
wm := membership.Member{ID: 1234, RaftAttributes: membership.RaftAttributes{PeerURLs: []string{"http://127.0.0.1:1"}}} wm := membership.Member{ID: 1234, RaftAttributes: membership.RaftAttributes{PeerURLs: []string{"http://127.0.0.1:1"}}}
_, err := s.UpdateMember(context.Background(), wm) _, err := s.UpdateMember(t.Context(), wm)
gaction := n.Action() gaction := n.Action()
s.Stop() s.Stop()
@ -1166,7 +1166,7 @@ func TestPublishV3(t *testing.T) {
// simulate that request has gone through consensus // simulate that request has gone through consensus
ch <- &apply2.Result{} ch <- &apply2.Result{}
w := wait.NewWithResponse(ch) w := wait.NewWithResponse(ch)
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(t.Context())
lg := zaptest.NewLogger(t) lg := zaptest.NewLogger(t)
be, _ := betesting.NewDefaultTmpBackend(t) be, _ := betesting.NewDefaultTmpBackend(t)
defer betesting.Close(t, be) defer betesting.Close(t, be)
@ -1208,7 +1208,7 @@ func TestPublishV3(t *testing.T) {
// TestPublishV3Stopped tests that publish will be stopped if server is stopped. // TestPublishV3Stopped tests that publish will be stopped if server is stopped.
func TestPublishV3Stopped(t *testing.T) { func TestPublishV3Stopped(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(t.Context())
r := newRaftNode(raftNodeConfig{ r := newRaftNode(raftNodeConfig{
lg: zaptest.NewLogger(t), lg: zaptest.NewLogger(t),
Node: newNodeNop(), Node: newNodeNop(),
@ -1236,7 +1236,7 @@ func TestPublishV3Stopped(t *testing.T) {
// TestPublishV3Retry tests that publish will keep retry until success. // TestPublishV3Retry tests that publish will keep retry until success.
func TestPublishV3Retry(t *testing.T) { func TestPublishV3Retry(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(t.Context())
n := newNodeRecorderStream() n := newNodeRecorderStream()
lg := zaptest.NewLogger(t) lg := zaptest.NewLogger(t)
@ -1290,7 +1290,7 @@ func TestUpdateVersionV3(t *testing.T) {
// simulate that request has gone through consensus // simulate that request has gone through consensus
ch <- &apply2.Result{} ch <- &apply2.Result{}
w := wait.NewWithResponse(ch) w := wait.NewWithResponse(ch)
ctx, cancel := context.WithCancel(context.TODO()) ctx, cancel := context.WithCancel(t.Context())
lg := zaptest.NewLogger(t) lg := zaptest.NewLogger(t)
be, _ := betesting.NewDefaultTmpBackend(t) be, _ := betesting.NewDefaultTmpBackend(t)
defer betesting.Close(t, be) defer betesting.Close(t, be)

10
server/etcdserver/txn/txn_test.go
View File

@ -226,7 +226,7 @@ func TestCheckTxn(t *testing.T) {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
s, lessor := setup(t, tc.setup) s, lessor := setup(t, tc.setup)
ctx, cancel := context.WithCancel(context.TODO()) ctx, cancel := context.WithCancel(t.Context())
defer cancel() defer cancel()
_, _, err := Txn(ctx, zaptest.NewLogger(t), tc.txn, false, s, lessor) _, _, err := Txn(ctx, zaptest.NewLogger(t), tc.txn, false, s, lessor)
@ -246,7 +246,7 @@ func TestCheckPut(t *testing.T) {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
s, lessor := setup(t, tc.setup) s, lessor := setup(t, tc.setup)
ctx, cancel := context.WithCancel(context.TODO()) ctx, cancel := context.WithCancel(t.Context())
defer cancel() defer cancel()
_, _, err := Put(ctx, zaptest.NewLogger(t), lessor, s, tc.op.GetRequestPut()) _, _, err := Put(ctx, zaptest.NewLogger(t), lessor, s, tc.op.GetRequestPut())
@ -266,7 +266,7 @@ func TestCheckRange(t *testing.T) {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
s, _ := setup(t, tc.setup) s, _ := setup(t, tc.setup)
ctx, cancel := context.WithCancel(context.TODO()) ctx, cancel := context.WithCancel(t.Context())
defer cancel() defer cancel()
_, _, err := Range(ctx, zaptest.NewLogger(t), s, tc.op.GetRequestRange()) _, _, err := Range(ctx, zaptest.NewLogger(t), s, tc.op.GetRequestRange())
@ -314,7 +314,7 @@ func TestReadonlyTxnError(t *testing.T) {
defer s.Close() defer s.Close()
// setup cancelled context // setup cancelled context
ctx, cancel := context.WithCancel(context.TODO()) ctx, cancel := context.WithCancel(t.Context())
cancel() cancel()
// put some data to prevent early termination in rangeKeys // put some data to prevent early termination in rangeKeys
@ -345,7 +345,7 @@ func TestWriteTxnPanicWithoutApply(t *testing.T) {
defer s.Close() defer s.Close()
// setup cancelled context // setup cancelled context
ctx, cancel := context.WithCancel(context.TODO()) ctx, cancel := context.WithCancel(t.Context())
cancel() cancel()
// write txn that puts some data and then fails in range due to cancelled context // write txn that puts some data and then fails in range due to cancelled context

6
server/etcdserver/version/version_test.go
View File

@ -65,7 +65,7 @@ func TestDowngradeSingleNode(t *testing.T) {
c.StepMonitors() c.StepMonitors()
assert.Equal(t, newCluster(lg, 1, version.V3_6), c) assert.Equal(t, newCluster(lg, 1, version.V3_6), c)
require.NoError(t, c.Version().DowngradeEnable(context.Background(), &version.V3_5)) require.NoError(t, c.Version().DowngradeEnable(t.Context(), &version.V3_5))
c.StepMonitors() c.StepMonitors()
assert.Equal(t, version.V3_5, c.clusterVersion) assert.Equal(t, version.V3_5, c.clusterVersion)
@ -81,7 +81,7 @@ func TestDowngradeThreeNode(t *testing.T) {
c.StepMonitors() c.StepMonitors()
assert.Equal(t, newCluster(lg, 3, version.V3_6), c) assert.Equal(t, newCluster(lg, 3, version.V3_6), c)
require.NoError(t, c.Version().DowngradeEnable(context.Background(), &version.V3_5)) require.NoError(t, c.Version().DowngradeEnable(t.Context(), &version.V3_5))
c.StepMonitors() c.StepMonitors()
assert.Equal(t, version.V3_5, c.clusterVersion) assert.Equal(t, version.V3_5, c.clusterVersion)
@ -101,7 +101,7 @@ func TestNewerMemberCanReconnectDuringDowngrade(t *testing.T) {
c.StepMonitors() c.StepMonitors()
assert.Equal(t, newCluster(lg, 3, version.V3_6), c) assert.Equal(t, newCluster(lg, 3, version.V3_6), c)
require.NoError(t, c.Version().DowngradeEnable(context.Background(), &version.V3_5)) require.NoError(t, c.Version().DowngradeEnable(t.Context(), &version.V3_5))
c.StepMonitors() c.StepMonitors()
assert.Equal(t, version.V3_5, c.clusterVersion) assert.Equal(t, version.V3_5, c.clusterVersion)

9
server/lease/leasehttp/http_test.go
View File

@ -15,7 +15,6 @@
package leasehttp package leasehttp
import ( import (
"context"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"testing" "testing"
@ -42,7 +41,7 @@ func TestRenewHTTP(t *testing.T) {
ts := httptest.NewServer(NewHandler(le, waitReady)) ts := httptest.NewServer(NewHandler(le, waitReady))
defer ts.Close() defer ts.Close()
ttl, err := RenewHTTP(context.TODO(), l.ID, ts.URL+LeasePrefix, http.DefaultTransport) ttl, err := RenewHTTP(t.Context(), l.ID, ts.URL+LeasePrefix, http.DefaultTransport)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -66,7 +65,7 @@ func TestTimeToLiveHTTP(t *testing.T) {
ts := httptest.NewServer(NewHandler(le, waitReady)) ts := httptest.NewServer(NewHandler(le, waitReady))
defer ts.Close() defer ts.Close()
resp, err := TimeToLiveHTTP(context.TODO(), l.ID, true, ts.URL+LeaseInternalPrefix, http.DefaultTransport) resp, err := TimeToLiveHTTP(t.Context(), l.ID, true, ts.URL+LeaseInternalPrefix, http.DefaultTransport)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -80,14 +79,14 @@ func TestTimeToLiveHTTP(t *testing.T) {
func TestRenewHTTPTimeout(t *testing.T) { func TestRenewHTTPTimeout(t *testing.T) {
testApplyTimeout(t, func(l *lease.Lease, serverURL string) error { testApplyTimeout(t, func(l *lease.Lease, serverURL string) error {
_, err := RenewHTTP(context.TODO(), l.ID, serverURL+LeasePrefix, http.DefaultTransport) _, err := RenewHTTP(t.Context(), l.ID, serverURL+LeasePrefix, http.DefaultTransport)
return err return err
}) })
} }
func TestTimeToLiveHTTPTimeout(t *testing.T) { func TestTimeToLiveHTTPTimeout(t *testing.T) {
testApplyTimeout(t, func(l *lease.Lease, serverURL string) error { testApplyTimeout(t, func(l *lease.Lease, serverURL string) error {
_, err := TimeToLiveHTTP(context.TODO(), l.ID, true, serverURL+LeaseInternalPrefix, http.DefaultTransport) _, err := TimeToLiveHTTP(t.Context(), l.ID, true, serverURL+LeaseInternalPrefix, http.DefaultTransport)
return err return err
}) })
} }

2
server/storage/backend/hooks_test.go
View File

@ -69,7 +69,7 @@ func write(tx backend.BatchTx, k, v []byte) {
} }
func TestBackendAutoCommitBatchIntervalHook(t *testing.T) { func TestBackendAutoCommitBatchIntervalHook(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), time.Minute) ctx, cancel := context.WithTimeout(t.Context(), time.Minute)
defer cancel() defer cancel()
cfg := backend.DefaultBackendConfig(zaptest.NewLogger(t)) cfg := backend.DefaultBackendConfig(zaptest.NewLogger(t))

2
server/storage/mvcc/hash_test.go
View File

@ -138,7 +138,7 @@ func TestCompactionHash(t *testing.T) {
s := NewStore(zaptest.NewLogger(t), b, &lease.FakeLessor{}, StoreConfig{}) s := NewStore(zaptest.NewLogger(t), b, &lease.FakeLessor{}, StoreConfig{})
defer cleanup(s, b) defer cleanup(s, b)
testutil.TestCompactionHash(context.Background(), t, hashTestCase{s}, s.cfg.CompactionBatchLimit) testutil.TestCompactionHash(t.Context(), t, hashTestCase{s}, s.cfg.CompactionBatchLimit)
} }
type hashTestCase struct { type hashTestCase struct {

22
server/storage/mvcc/kv_test.go
View File

@ -273,7 +273,7 @@ func testKVPutMultipleTimes(t *testing.T, f putFunc) {
t.Errorf("#%d: rev = %d, want %d", i, rev, base+1) t.Errorf("#%d: rev = %d, want %d", i, rev, base+1)
} }
r, err := s.Range(context.TODO(), []byte("foo"), nil, RangeOptions{}) r, err := s.Range(t.Context(), []byte("foo"), nil, RangeOptions{})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -384,7 +384,7 @@ func testKVPutWithSameLease(t *testing.T, f putFunc) {
} }
// check leaseID // check leaseID
r, err := s.Range(context.TODO(), []byte("foo"), nil, RangeOptions{}) r, err := s.Range(t.Context(), []byte("foo"), nil, RangeOptions{})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -412,7 +412,7 @@ func TestKVOperationInSequence(t *testing.T) {
t.Errorf("#%d: put rev = %d, want %d", i, rev, base+1) t.Errorf("#%d: put rev = %d, want %d", i, rev, base+1)
} }
r, err := s.Range(context.TODO(), []byte("foo"), nil, RangeOptions{Rev: base + 1}) r, err := s.Range(t.Context(), []byte("foo"), nil, RangeOptions{Rev: base + 1})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -432,7 +432,7 @@ func TestKVOperationInSequence(t *testing.T) {
t.Errorf("#%d: n = %d, rev = %d, want (%d, %d)", i, n, rev, 1, base+2) t.Errorf("#%d: n = %d, rev = %d, want (%d, %d)", i, n, rev, 1, base+2)
} }
r, err = s.Range(context.TODO(), []byte("foo"), nil, RangeOptions{Rev: base + 2}) r, err = s.Range(t.Context(), []byte("foo"), nil, RangeOptions{Rev: base + 2})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -490,7 +490,7 @@ func TestKVTxnNonBlockRange(t *testing.T) {
donec := make(chan struct{}) donec := make(chan struct{})
go func() { go func() {
defer close(donec) defer close(donec)
s.Range(context.TODO(), []byte("foo"), nil, RangeOptions{}) s.Range(t.Context(), []byte("foo"), nil, RangeOptions{})
}() }()
select { select {
case <-donec: case <-donec:
@ -516,7 +516,7 @@ func TestKVTxnOperationInSequence(t *testing.T) {
t.Errorf("#%d: put rev = %d, want %d", i, rev, base+1) t.Errorf("#%d: put rev = %d, want %d", i, rev, base+1)
} }
r, err := txn.Range(context.TODO(), []byte("foo"), nil, RangeOptions{Rev: base + 1}) r, err := txn.Range(t.Context(), []byte("foo"), nil, RangeOptions{Rev: base + 1})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -536,7 +536,7 @@ func TestKVTxnOperationInSequence(t *testing.T) {
t.Errorf("#%d: n = %d, rev = %d, want (%d, %d)", i, n, rev, 1, base+1) t.Errorf("#%d: n = %d, rev = %d, want (%d, %d)", i, n, rev, 1, base+1)
} }
r, err = txn.Range(context.TODO(), []byte("foo"), nil, RangeOptions{Rev: base + 1}) r, err = txn.Range(t.Context(), []byte("foo"), nil, RangeOptions{Rev: base + 1})
if err != nil { if err != nil {
t.Errorf("#%d: range error (%v)", i, err) t.Errorf("#%d: range error (%v)", i, err)
} }
@ -595,7 +595,7 @@ func TestKVCompactReserveLastValue(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("#%d: unexpect compact error %v", i, err) t.Errorf("#%d: unexpect compact error %v", i, err)
} }
r, err := s.Range(context.TODO(), []byte("foo"), nil, RangeOptions{Rev: tt.rev + 1}) r, err := s.Range(t.Context(), []byte("foo"), nil, RangeOptions{Rev: tt.rev + 1})
if err != nil { if err != nil {
t.Errorf("#%d: unexpect range error %v", i, err) t.Errorf("#%d: unexpect range error %v", i, err)
} }
@ -697,7 +697,7 @@ func TestKVRestore(t *testing.T) {
tt(s) tt(s)
var kvss [][]mvccpb.KeyValue var kvss [][]mvccpb.KeyValue
for k := int64(0); k < 10; k++ { for k := int64(0); k < 10; k++ {
r, _ := s.Range(context.TODO(), []byte("a"), []byte("z"), RangeOptions{Rev: k}) r, _ := s.Range(t.Context(), []byte("a"), []byte("z"), RangeOptions{Rev: k})
kvss = append(kvss, r.KVs) kvss = append(kvss, r.KVs)
} }
@ -715,7 +715,7 @@ func TestKVRestore(t *testing.T) {
testutil.WaitSchedule() testutil.WaitSchedule()
var nkvss [][]mvccpb.KeyValue var nkvss [][]mvccpb.KeyValue
for k := int64(0); k < 10; k++ { for k := int64(0); k < 10; k++ {
r, _ := ns.Range(context.TODO(), []byte("a"), []byte("z"), RangeOptions{Rev: k}) r, _ := ns.Range(t.Context(), []byte("a"), []byte("z"), RangeOptions{Rev: k})
nkvss = append(nkvss, r.KVs) nkvss = append(nkvss, r.KVs)
} }
cleanup(ns, b) cleanup(ns, b)
@ -759,7 +759,7 @@ func TestKVSnapshot(t *testing.T) {
ns := NewStore(zaptest.NewLogger(t), b, &lease.FakeLessor{}, StoreConfig{}) ns := NewStore(zaptest.NewLogger(t), b, &lease.FakeLessor{}, StoreConfig{})
defer ns.Close() defer ns.Close()
r, err := ns.Range(context.TODO(), []byte("a"), []byte("z"), RangeOptions{}) r, err := ns.Range(t.Context(), []byte("a"), []byte("z"), RangeOptions{})
if err != nil { if err != nil {
t.Errorf("unexpect range error (%v)", err) t.Errorf("unexpect range error (%v)", err)
} }

3
server/storage/mvcc/kvstore_bench_test.go
View File

@ -15,7 +15,6 @@
package mvcc package mvcc
import ( import (
"context"
"testing" "testing"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@ -70,7 +69,7 @@ func benchmarkStoreRange(b *testing.B, n int) {
b.ReportAllocs() b.ReportAllocs()
b.ResetTimer() b.ResetTimer()
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
s.Range(context.TODO(), begin, end, RangeOptions{}) s.Range(b.Context(), begin, end, RangeOptions{})
} }
} }

3
server/storage/mvcc/kvstore_compaction_test.go
View File

@ -15,7 +15,6 @@
package mvcc package mvcc
import ( import (
"context"
"reflect" "reflect"
"testing" "testing"
"time" "time"
@ -139,7 +138,7 @@ func TestCompactAllAndRestore(t *testing.T) {
if s1.Rev() != rev { if s1.Rev() != rev {
t.Errorf("rev = %v, want %v", s1.Rev(), rev) t.Errorf("rev = %v, want %v", s1.Rev(), rev)
} }
_, err = s1.Range(context.TODO(), []byte("foo"), nil, RangeOptions{}) _, err = s1.Range(t.Context(), []byte("foo"), nil, RangeOptions{})
if err != nil { if err != nil {
t.Errorf("unexpect range error %v", err) t.Errorf("unexpect range error %v", err)
} }

13
server/storage/mvcc/kvstore_test.go
View File

@ -16,7 +16,6 @@ package mvcc
import ( import (
"bytes" "bytes"
"context"
"crypto/rand" "crypto/rand"
"encoding/binary" "encoding/binary"
"errors" "errors"
@ -218,7 +217,7 @@ func TestStoreRange(t *testing.T) {
b.tx.rangeRespc <- tt.r b.tx.rangeRespc <- tt.r
fi.indexRangeRespc <- tt.idxr fi.indexRangeRespc <- tt.idxr
ret, err := s.Range(context.TODO(), []byte("foo"), []byte("goo"), ro) ret, err := s.Range(t.Context(), []byte("foo"), []byte("goo"), ro)
if err != nil { if err != nil {
t.Errorf("#%d: err = %v, want nil", i, err) t.Errorf("#%d: err = %v, want nil", i, err)
} }
@ -469,7 +468,7 @@ func TestRestoreDelete(t *testing.T) {
defer s.Close() defer s.Close()
for i := 0; i < 20; i++ { for i := 0; i < 20; i++ {
ks := fmt.Sprintf("foo-%d", i) ks := fmt.Sprintf("foo-%d", i)
r, err := s.Range(context.TODO(), []byte(ks), nil, RangeOptions{}) r, err := s.Range(t.Context(), []byte(ks), nil, RangeOptions{})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -519,7 +518,7 @@ func TestRestoreContinueUnfinishedCompaction(t *testing.T) {
// wait for scheduled compaction to be finished // wait for scheduled compaction to be finished
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
if _, err := s.Range(context.TODO(), []byte("foo"), nil, RangeOptions{Rev: 1}); !errors.Is(err, ErrCompacted) { if _, err := s.Range(t.Context(), []byte("foo"), nil, RangeOptions{Rev: 1}); !errors.Is(err, ErrCompacted) {
t.Errorf("range on compacted rev error = %v, want %v", err, ErrCompacted) t.Errorf("range on compacted rev error = %v, want %v", err, ErrCompacted)
} }
// check the key in backend is deleted // check the key in backend is deleted
@ -757,7 +756,7 @@ func TestConcurrentReadNotBlockingWrite(t *testing.T) {
// readTx2 simulates a short read request // readTx2 simulates a short read request
readTx2 := s.Read(ConcurrentReadTxMode, traceutil.TODO()) readTx2 := s.Read(ConcurrentReadTxMode, traceutil.TODO())
ro := RangeOptions{Limit: 1, Rev: 0, Count: false} ro := RangeOptions{Limit: 1, Rev: 0, Count: false}
ret, err := readTx2.Range(context.TODO(), []byte("foo"), nil, ro) ret, err := readTx2.Range(t.Context(), []byte("foo"), nil, ro)
if err != nil { if err != nil {
t.Fatalf("failed to range: %v", err) t.Fatalf("failed to range: %v", err)
} }
@ -774,7 +773,7 @@ func TestConcurrentReadNotBlockingWrite(t *testing.T) {
} }
readTx2.End() readTx2.End()
ret, err = readTx1.Range(context.TODO(), []byte("foo"), nil, ro) ret, err = readTx1.Range(t.Context(), []byte("foo"), nil, ro)
if err != nil { if err != nil {
t.Fatalf("failed to range: %v", err) t.Fatalf("failed to range: %v", err)
} }
@ -841,7 +840,7 @@ func TestConcurrentReadTxAndWrite(t *testing.T) {
tx := s.Read(ConcurrentReadTxMode, traceutil.TODO()) tx := s.Read(ConcurrentReadTxMode, traceutil.TODO())
mu.Unlock() mu.Unlock()
// get all keys in backend store, and compare with wKVs // get all keys in backend store, and compare with wKVs
ret, err := tx.Range(context.TODO(), []byte("\x00000000"), []byte("\xffffffff"), RangeOptions{}) ret, err := tx.Range(t.Context(), []byte("\x00000000"), []byte("\xffffffff"), RangeOptions{})
tx.End() tx.End()
if err != nil { if err != nil {
t.Errorf("failed to range keys: %v", err) t.Errorf("failed to range keys: %v", err)