rename ctxWithTimeout to ctx

Author: hasson82

internal/xds/rbac/rbac_engine_test.go

@@ -1747,13 +1747,13 @@ func (s) TestChainEngine(t *testing.T) {
 			// if the chain of RBAC Engines configured as such works as intended.
 			for _, data := range test.rbacQueries {
 				func() {
-					ctxWithTimeout, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
+					ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
 					defer cancel()
 					// Construct the context with three data points that have enough
 					// information to represent incoming RPC's. This will be how a
 					// user uses this API. A user will have to put MD, PeerInfo, and
 					// the connection the RPC is sent on in the context.
-					ctx := metadata.NewIncomingContext(ctxWithTimeout, data.rpcData.md)
+					ctx = metadata.NewIncomingContext(ctx, data.rpcData.md)
 					// Make a TCP connection with a certain destination port. The
 					// address/port of this connection will be used to populate the
 					// destination ip/port in RPCData struct. This represents what

metadata/metadata_test.go

@@ -31,7 +31,7 @@ import (
 
 const defaultTestTimeout = 10 * time.Second
 
-var ctxWithTimeout, cancel = context.WithTimeout(context.Background(), defaultTestTimeout)
+var ctx, cancel = context.WithTimeout(context.Background(), defaultTestTimeout)
 
 type s struct {
 	grpctest.Tester
@@ -207,7 +207,7 @@ func (s) TestFromIncomingContext(t *testing.T) {
 	)
 	// Verify that we lowercase if callers directly modify md
 	md["X-INCORRECT-UPPERCASE"] = []string{"foo"}
-	ctx := NewIncomingContext(ctxWithTimeout, md)
+	ctx := NewIncomingContext(ctx, md)
 	defer cancel()
 
 	result, found := FromIncomingContext(ctx)
@@ -244,7 +244,7 @@ func (s) TestValueFromIncomingContext(t *testing.T) {
 	)
 	// Verify that we lowercase if callers directly modify md
 	md["X-INCORRECT-UPPERCASE"] = []string{"foo"}
-	ctx := NewIncomingContext(ctxWithTimeout, md)
+	ctx := NewIncomingContext(ctx, md)
 	defer cancel()
 
 	for _, test := range []struct {
@@ -402,7 +402,7 @@ func BenchmarkFromOutgoingContext(b *testing.B) {
 
 func BenchmarkFromIncomingContext(b *testing.B) {
 	md := Pairs("X-My-Header-1", "42")
-	ctx := NewIncomingContext(ctxWithTimeout, md)
+	ctx := NewIncomingContext(ctx, md)
 	defer cancel()
 
 	b.ResetTimer()
@@ -413,7 +413,7 @@ func BenchmarkFromIncomingContext(b *testing.B) {
 
 func BenchmarkValueFromIncomingContext(b *testing.B) {
 	md := Pairs("X-My-Header-1", "42")
-	ctx := NewIncomingContext(ctxWithTimeout, md)
+	ctx := NewIncomingContext(ctx, md)
 	defer cancel()
 
 	b.Run("key-found", func(b *testing.B) {

peer/peer_test.go

@@ -85,9 +85,9 @@ func TestPeerStringer(t *testing.T) {
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			ctxWithTimeout, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
+			ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
 			defer cancel()
-			ctx := NewContext(ctxWithTimeout, tc.peer)
+			ctx = NewContext(ctx, tc.peer)
 
 			p, ok := FromContext(ctx)
 			if !ok {