Merge branch v2.11 into v3.4

integration/etcd_test.go

@@ -2,7 +2,6 @@ package integration
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"net"
 	"net/http"
@@ -41,7 +40,7 @@ func (s *EtcdSuite) SetupSuite() {
 	var err error
 	s.etcdAddr = net.JoinHostPort(s.getComposeServiceIP("etcd"), "2379")
 	s.kvClient, err = valkeyrie.NewStore(
-		context.Background(),
+		s.T().Context(),
 		etcdv3.StoreName,
 		[]string{s.etcdAddr},
 		&etcdv3.Config{
@@ -108,7 +107,7 @@ func (s *EtcdSuite) TestSimpleConfiguration() {
 	}
 
 	for k, v := range data {
-		err := s.kvClient.Put(context.Background(), k, []byte(v), nil)
+		err := s.kvClient.Put(s.T().Context(), k, []byte(v), nil)
 		require.NoError(s.T(), err)
 	}