pkg: address Go 1.24 usetesting issues

Replace Contexts with the one provided by the test package.

Signed-off-by: Ivan Valdes <ivan@vald.es>

pkg/expect/expect_test.go

@@ -31,7 +31,7 @@ func TestExpectFunc(t *testing.T) {
 	ep, err := NewExpect("echo", "hello world")
 	require.NoError(t, err)
 	wstr := "hello world\r\n"
-	l, eerr := ep.ExpectFunc(context.Background(), func(a string) bool { return len(a) > 10 })
+	l, eerr := ep.ExpectFunc(t.Context(), func(a string) bool { return len(a) > 10 })
 	require.NoError(t, eerr)
 	require.Equalf(t, l, wstr, `got "%v", expected "%v"`, l, wstr)
 	require.NoError(t, ep.Close())
@@ -49,7 +49,7 @@ func TestExpectFuncTimeout(t *testing.T) {
 		}
 	}()
 
-	ctx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond)
+	ctx, cancel := context.WithTimeout(t.Context(), 500*time.Millisecond)
 	defer cancel()
 
 	_, err = ep.ExpectFunc(ctx, func(a string) bool { return false })
@@ -66,7 +66,7 @@ func TestExpectFuncExitFailure(t *testing.T) {
 	ep, err := NewExpect("tail", "-x")
 	require.NoError(t, err)
 
-	ctx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond)
+	ctx, cancel := context.WithTimeout(t.Context(), 500*time.Millisecond)
 	defer cancel()
 
 	_, err = ep.ExpectFunc(ctx, func(s string) bool {
@@ -81,7 +81,7 @@ func TestExpectFuncExitFailureStop(t *testing.T) {
 	ep, err := NewExpect("tail", "-x")
 	require.NoError(t, err)
 
-	ctx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond)
+	ctx, cancel := context.WithTimeout(t.Context(), 500*time.Millisecond)
 	defer cancel()
 
 	_, err = ep.ExpectFunc(ctx, func(s string) bool {
@@ -101,7 +101,7 @@ func TestExpectFuncExitFailureStop(t *testing.T) {
 func TestEcho(t *testing.T) {
 	ep, err := NewExpect("echo", "hello world")
 	require.NoError(t, err)
-	ctx := context.Background()
+	ctx := t.Context()
 	l, eerr := ep.ExpectWithContext(ctx, ExpectedResponse{Value: "world"})
 	require.NoError(t, eerr)
 	wstr := "hello world"
@@ -115,7 +115,7 @@ func TestLineCount(t *testing.T) {
 	ep, err := NewExpect("printf", "1\n2\n3")
 	require.NoError(t, err)
 	wstr := "3"
-	l, eerr := ep.ExpectWithContext(context.Background(), ExpectedResponse{Value: wstr})
+	l, eerr := ep.ExpectWithContext(t.Context(), ExpectedResponse{Value: wstr})
 	require.NoError(t, eerr)
 	require.Equalf(t, l, wstr, `got "%v", expected "%v"`, l, wstr)
 	require.Equalf(t, 3, ep.LineCount(), "got %d, expected 3", ep.LineCount())
@@ -127,7 +127,7 @@ func TestSend(t *testing.T) {
 	require.NoError(t, err)
 	err = ep.Send("a\r")
 	require.NoError(t, err)
-	_, err = ep.ExpectWithContext(context.Background(), ExpectedResponse{Value: "b"})
+	_, err = ep.ExpectWithContext(t.Context(), ExpectedResponse{Value: "b"})
 	require.NoError(t, err)
 	require.NoError(t, ep.Stop())
 }
@@ -208,7 +208,7 @@ func TestResponseMatchRegularExpr(t *testing.T) {
 			ep, err := NewExpect("echo", "-n", tc.mockOutput)
 			require.NoError(t, err)
 
-			ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+			ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)
 			defer cancel()
 			l, err := ep.ExpectWithContext(ctx, tc.expectedResp)
 

pkg/netutil/netutil_test.go

@@ -134,7 +134,7 @@ func TestResolveTCPAddrs(t *testing.T) {
 			}
 			return &net.TCPAddr{IP: net.ParseIP(tt.hostMap[host]), Port: i, Zone: ""}, nil
 		}
-		ctx, cancel := context.WithTimeout(context.TODO(), time.Second)
+		ctx, cancel := context.WithTimeout(t.Context(), time.Second)
 		urls, err := resolveTCPAddrs(ctx, zaptest.NewLogger(t), tt.urls)
 		cancel()
 		if tt.hasError {
@@ -305,7 +305,7 @@ func TestURLsEqual(t *testing.T) {
 	}
 
 	for i, test := range tests {
-		result, err := urlsEqual(context.TODO(), zaptest.NewLogger(t), test.a, test.b)
+		result, err := urlsEqual(t.Context(), zaptest.NewLogger(t), test.a, test.b)
 		assert.Equalf(t, result, test.expect, "idx=%d #%d: a:%v b:%v, expected %v but %v", i, test.n, test.a, test.b, test.expect, result)
 		if test.err != nil {
 			if err.Error() != test.err.Error() {
@@ -342,7 +342,7 @@ func TestURLStringsEqual(t *testing.T) {
 	for idx, c := range cases {
 		t.Logf("TestURLStringsEqual, case #%d", idx)
 		resolveTCPAddr = c.resolver
-		result, err := URLStringsEqual(context.TODO(), zaptest.NewLogger(t), c.urlsA, c.urlsB)
+		result, err := URLStringsEqual(t.Context(), zaptest.NewLogger(t), c.urlsA, c.urlsB)
 		assert.Truef(t, result, "unexpected result %v", result)
 		assert.NoErrorf(t, err, "unexpected error %v", err)
 	}

pkg/proxy/server_test.go

@@ -16,7 +16,6 @@ package proxy
 
 import (
 	"bytes"
-	"context"
 	"crypto/tls"
 	"fmt"
 	"io"
@@ -613,7 +612,7 @@ func send(t *testing.T, data []byte, scheme, addr string, tlsInfo transport.TLSI
 	if !tlsInfo.Empty() {
 		tp, terr := transport.NewTransport(tlsInfo, 3*time.Second)
 		require.NoError(t, terr)
-		out, err = tp.DialContext(context.Background(), scheme, addr)
+		out, err = tp.DialContext(t.Context(), scheme, addr)
 	} else {
 		out, err = net.Dial(scheme, addr)
 	}

pkg/traceutil/trace_test.go

@@ -38,12 +38,12 @@ func TestGet(t *testing.T) {
 	}{
 		{
 			name:        "When the context does not have trace",
-			inputCtx:    context.TODO(),
+			inputCtx:    t.Context(),
 			outputTrace: TODO(),
 		},
 		{
 			name:        "When the context has trace",
-			inputCtx:    context.WithValue(context.Background(), TraceKey{}, traceForTest),
+			inputCtx:    context.WithValue(t.Context(), TraceKey{}, traceForTest),
 			outputTrace: traceForTest,
 		},
 	}