move ctx to inside each test

Author: hasson82

metadata/metadata_test.go

@@ -31,8 +31,6 @@ import (
 
 const defaultTestTimeout = 10 * time.Second
 
-var ctx, cancel = context.WithTimeout(context.Background(), defaultTestTimeout)
-
 type s struct {
 	grpctest.Tester
 }
@@ -205,10 +203,11 @@ func (s) TestFromIncomingContext(t *testing.T) {
 	md := Pairs(
 		"X-My-Header-1", "42",
 	)
+	ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
+	defer cancel()
 	// Verify that we lowercase if callers directly modify md
 	md["X-INCORRECT-UPPERCASE"] = []string{"foo"}
-	ctx := NewIncomingContext(ctx, md)
-	defer cancel()
+	ctx = NewIncomingContext(ctx, md)
 
 	result, found := FromIncomingContext(ctx)
 	if !found {
@@ -242,10 +241,11 @@ func (s) TestValueFromIncomingContext(t *testing.T) {
 		"X-My-Header-2", "43-2",
 		"x-my-header-3", "44",
 	)
+	ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
+	defer cancel()
 	// Verify that we lowercase if callers directly modify md
 	md["X-INCORRECT-UPPERCASE"] = []string{"foo"}
-	ctx := NewIncomingContext(ctx, md)
-	defer cancel()
+	ctx = NewIncomingContext(ctx, md)
 
 	for _, test := range []struct {
 		key  string
@@ -401,9 +401,10 @@ func BenchmarkFromOutgoingContext(b *testing.B) {
 }
 
 func BenchmarkFromIncomingContext(b *testing.B) {
-	md := Pairs("X-My-Header-1", "42")
-	ctx := NewIncomingContext(ctx, md)
+	ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
 	defer cancel()
+	md := Pairs("X-My-Header-1", "42")
+	ctx = NewIncomingContext(ctx, md)
 
 	b.ResetTimer()
 	for n := 0; n < b.N; n++ {
@@ -412,9 +413,10 @@ func BenchmarkFromIncomingContext(b *testing.B) {
 }
 
 func BenchmarkValueFromIncomingContext(b *testing.B) {
-	md := Pairs("X-My-Header-1", "42")
-	ctx := NewIncomingContext(ctx, md)
+	ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
 	defer cancel()
+	md := Pairs("X-My-Header-1", "42")
+	ctx = NewIncomingContext(ctx, md)
 
 	b.Run("key-found", func(b *testing.B) {
 		for n := 0; n < b.N; n++ {