Merge branch v2.11 into v3.4
This commit is contained in:
commit
bd4bfd8919
110 changed files with 493 additions and 494 deletions
|
|
@ -15,7 +15,7 @@ func TestNewPoolContext(t *testing.T) {
|
|||
|
||||
testKey := testKeyType("test")
|
||||
|
||||
ctx := context.WithValue(context.Background(), testKey, "test")
|
||||
ctx := context.WithValue(t.Context(), testKey, "test")
|
||||
p := NewPool(ctx)
|
||||
|
||||
p.GoCtx(func(ctx context.Context) {
|
||||
|
|
@ -66,7 +66,7 @@ func TestPoolWithCtx(t *testing.T) {
|
|||
t.Run(test.desc, func(t *testing.T) {
|
||||
// These subtests cannot be run in parallel, since the testRoutine
|
||||
// is shared across the subtests.
|
||||
p := NewPool(context.Background())
|
||||
p := NewPool(t.Context())
|
||||
timer := time.NewTimer(500 * time.Millisecond)
|
||||
defer timer.Stop()
|
||||
|
||||
|
|
@ -93,7 +93,7 @@ func TestPoolWithCtx(t *testing.T) {
|
|||
}
|
||||
|
||||
func TestPoolCleanupWithGoPanicking(t *testing.T) {
|
||||
p := NewPool(context.Background())
|
||||
p := NewPool(t.Context())
|
||||
|
||||
timer := time.NewTimer(500 * time.Millisecond)
|
||||
defer timer.Stop()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue