From fb8691edae2d653022477bd201bff2fb210b2174 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 12 Mar 2025 10:59:10 +0100 Subject: [PATCH] syscall: use testing.T.Context Change-Id: I62763878d51598bf1ae0a4e75441e1d3a4b86aa3 Reviewed-on: https://go-review.googlesource.com/c/go/+/656955 LUCI-TryBot-Result: Go LUCI Auto-Submit: Tobias Klauser Reviewed-by: David Chase Reviewed-by: Ian Lance Taylor --- src/syscall/syscall_linux_test.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/syscall/syscall_linux_test.go b/src/syscall/syscall_linux_test.go index c719be5222..df096a0b47 100644 --- a/src/syscall/syscall_linux_test.go +++ b/src/syscall/syscall_linux_test.go @@ -5,7 +5,6 @@ package syscall_test import ( - "context" "fmt" "internal/testenv" "io" @@ -734,9 +733,6 @@ func TestPrlimitFileLimit(t *testing.T) { t.Fatal(err) } - ctx, cancel := context.WithCancel(context.Background()) - defer cancel() - exe, err := os.Executable() if err != nil { t.Fatal(err) @@ -759,7 +755,7 @@ func TestPrlimitFileLimit(t *testing.T) { var output strings.Builder const arg = "-test.run=^TestPrlimitFileLimit$" - cmd := testenv.CommandContext(t, ctx, exe, arg, "-test.v") + cmd := testenv.CommandContext(t, t.Context(), exe, arg, "-test.v") cmd = testenv.CleanCmdEnv(cmd) cmd.Env = append(cmd.Env, "GO_WANT_HELPER_PROCESS=prlimit1") cmd.ExtraFiles = []*os.File{r1, w2} @@ -846,16 +842,13 @@ func testPrlimitFileLimitHelper1(t *testing.T) { // Start the grandchild, which should see the rlimit // set by the prlimit called by the parent. - ctx, cancel := context.WithCancel(context.Background()) - defer cancel() - exe, err := os.Executable() if err != nil { t.Fatal(err) } const arg = "-test.run=^TestPrlimitFileLimit$" - cmd := testenv.CommandContext(t, ctx, exe, arg, "-test.v") + cmd := testenv.CommandContext(t, t.Context(), exe, arg, "-test.v") cmd = testenv.CleanCmdEnv(cmd) cmd.Env = append(cmd.Env, "GO_WANT_HELPER_PROCESS=prlimit2") t.Logf("running %s %s", exe, arg) -- 2.50.0