Replace context.Background with testing.TB.Context where possible (#15416)

* Replace context.Background with testing.TB.Context where possible

* Fix failing tests
This commit is contained in:
Preston Van Loon
2025-06-16 17:09:18 -05:00
committed by GitHub
parent 6a13ba9125
commit 62fec4d1f3
409 changed files with 3175 additions and 3456 deletions

View File

@@ -146,7 +146,7 @@ func TestService_InitStartStop(t *testing.T) {
}
t.Run(tt.name, func(t *testing.T) {
defer hook.Reset()
ctx, cancel := context.WithCancel(context.Background())
ctx, cancel := context.WithCancel(t.Context())
defer cancel()
mc := &mock.ChainService{Genesis: time.Now(), ValidatorsRoot: [32]byte{}}
// Allow overriding with customized chain service.
@@ -211,7 +211,7 @@ func TestService_waitForStateInitialization(t *testing.T) {
t.Run("no state and context close", func(t *testing.T) {
defer hook.Reset()
ctx, cancel := context.WithCancel(context.Background())
ctx, cancel := context.WithCancel(t.Context())
defer cancel()
s, _ := newService(ctx, &mock.ChainService{Genesis: time.Now(), ValidatorsRoot: [32]byte{}})
@@ -237,7 +237,7 @@ func TestService_waitForStateInitialization(t *testing.T) {
t.Run("no state and state init event received", func(t *testing.T) {
defer hook.Reset()
ctx, cancel := context.WithCancel(context.Background())
ctx, cancel := context.WithCancel(t.Context())
defer cancel()
st, err := util.NewBeaconState()
@@ -270,7 +270,7 @@ func TestService_waitForStateInitialization(t *testing.T) {
t.Run("no state and state init event received and service start", func(t *testing.T) {
defer hook.Reset()
ctx, cancel := context.WithCancel(context.Background())
ctx, cancel := context.WithCancel(t.Context())
defer cancel()
s, gs := newService(ctx, &mock.ChainService{Genesis: time.Now(), ValidatorsRoot: [32]byte{}})
// Initialize mock feed
@@ -299,7 +299,7 @@ func TestService_waitForStateInitialization(t *testing.T) {
func TestService_markSynced(t *testing.T) {
mc := &mock.ChainService{Genesis: time.Now(), ValidatorsRoot: [32]byte{}}
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
ctx, cancel := context.WithTimeout(t.Context(), time.Second)
defer cancel()
s := NewService(ctx, &Config{
Chain: mc,
@@ -334,7 +334,7 @@ func TestService_Resync(t *testing.T) {
}, p.Peers())
cache.initializeRootCache(makeSequence(1, 160), t)
beaconDB := dbtest.SetupDB(t)
util.SaveBlock(t, context.Background(), beaconDB, util.NewBeaconBlock())
util.SaveBlock(t, t.Context(), beaconDB, util.NewBeaconBlock())
cache.RLock()
genesisRoot := cache.rootCache[0]
cache.RUnlock()
@@ -377,7 +377,7 @@ func TestService_Resync(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
defer hook.Reset()
ctx, cancel := context.WithCancel(context.Background())
ctx, cancel := context.WithCancel(t.Context())
defer cancel()
mc := &mock.ChainService{}
// Allow overriding with customized chain service.
@@ -407,7 +407,7 @@ func TestService_Resync(t *testing.T) {
}
func TestService_Initialized(t *testing.T) {
s := NewService(context.Background(), &Config{
s := NewService(t.Context(), &Config{
StateNotifier: &mock.MockStateNotifier{},
})
s.chainStarted.Set()
@@ -417,7 +417,7 @@ func TestService_Initialized(t *testing.T) {
}
func TestService_Synced(t *testing.T) {
s := NewService(context.Background(), &Config{})
s := NewService(t.Context(), &Config{})
s.synced.UnSet()
assert.Equal(t, false, s.Synced())
s.synced.Set()
@@ -491,7 +491,7 @@ func TestMissingBlobRequest(t *testing.T) {
}
func TestOriginOutsideRetention(t *testing.T) {
ctx := context.Background()
ctx := t.Context()
bdb := dbtest.SetupDB(t)
genesis := time.Unix(0, 0)
secsPerEpoch := params.BeaconConfig().SecondsPerSlot * uint64(params.BeaconConfig().SlotsPerEpoch)