Pass testing.T to roundtripper as context value. (#2944)

Author: briantkennedy

conformance/utils/http/http.go

@@ -127,6 +127,7 @@ func MakeRequest(t *testing.T, expected *ExpectedResponse, gwAddr, protocol, sch
 	tlog.Logf(t, "Making %s request to %s", expected.Request.Method, reqURL.String())
 
 	req := roundtripper.Request{
+		T:                t,
 		Method:           expected.Request.Method,
 		Host:             expected.Request.Host,
 		URL:              reqURL,

conformance/utils/roundtripper/roundtripper.go

@@ -29,10 +29,12 @@ import (
 	"net/http/httputil"
 	"net/url"
 	"regexp"
+	"testing"
 
 	"golang.org/x/net/http2"
 
 	"sigs.k8s.io/gateway-api/conformance/utils/config"
+	"sigs.k8s.io/gateway-api/conformance/utils/tlog"
 )
 
 const (
@@ -47,6 +49,7 @@ type RoundTripper interface {
 
 // Request is the primary input for making a request.
 type Request struct {
+	T                *testing.T
 	URL              url.URL
 	Host             string
 	Protocol         string
@@ -189,6 +192,7 @@ func (d *DefaultRoundTripper) defaultRoundTrip(request Request, transport http.R
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), d.TimeoutConfig.RequestTimeout)
 	defer cancel()
+	ctx = withT(ctx, request.T)
 	req, err := http.NewRequestWithContext(ctx, method, request.URL.String(), nil)
 	if err != nil {
 		return nil, nil, err
@@ -211,7 +215,7 @@ func (d *DefaultRoundTripper) defaultRoundTrip(request Request, transport http.R
 			return nil, nil, err
 		}
 
-		fmt.Printf("Sending Request:\n%s\n\n", formatDump(dump, "< "))
+		tlog.Logf(request.T, "Sending Request:\n%s\n\n", formatDump(dump, "< "))
 	}
 
 	resp, err := client.Do(req)
@@ -227,7 +231,7 @@ func (d *DefaultRoundTripper) defaultRoundTrip(request Request, transport http.R
 			return nil, nil, err
 		}
 
-		fmt.Printf("Received Response:\n%s\n\n", formatDump(dump, "< "))
+		tlog.Logf(request.T, "Received Response:\n%s\n\n", formatDump(dump, "< "))
 	}
 
 	cReq := &CapturedRequest{}
@@ -323,6 +327,25 @@ func IsTimeoutError(statusCode int) bool {
 	return false
 }
 
+// testingTContextKey is the key for adding testing.T to the context.Context
+type testingTContextKey struct{}
+
+// withT returns a context with the testing.T added as a value.
+func withT(ctx context.Context, t *testing.T) context.Context {
+	return context.WithValue(ctx, testingTContextKey{}, t)
+}
+
+// TFromContext returns the testing.T added to the context if available.
+func TFromContext(ctx context.Context) (*testing.T, bool) {
+	v := ctx.Value(testingTContextKey{})
+	if v != nil {
+		if t, ok := v.(*testing.T); ok {
+			return t, true
+		}
+	}
+	return nil, false
+}
+
 var startLineRegex = regexp.MustCompile(`(?m)^`)
 
 func formatDump(data []byte, prefix string) string {