From e8ec68edfac4f50f57dd7faf039bb5c0f8eaba88 Mon Sep 17 00:00:00 2001 From: "Bryan C. Mills" Date: Wed, 26 Oct 2022 11:44:34 -0400 Subject: internal/testenv: remove RunWithTimout For most tests, the test's deadline itself is more appropriate than an arbitrary timeout layered atop of it (especially once #48157 is implemented), and testenv.Command already adds cleaner timeout behavior when a command would run too close to the test's deadline. That makes RunWithTimeout something of an attractive nuisance. For now, migrate the two existing uses of it to testenv.CommandContext, with a shorter timeout implemented using context.WithTimeout. As a followup, we may want to drop the extra timeouts from these invocations entirely. Updates #50436. Updates #37405. Change-Id: I16840fd36c0137b6da87ec54012b3e44661f0d08 Reviewed-on: https://go-review.googlesource.com/c/go/+/445597 Reviewed-by: Ian Lance Taylor Run-TryBot: Bryan Mills Auto-Submit: Bryan Mills Reviewed-by: Austin Clements TryBot-Result: Gopher Robot --- src/runtime/crash_test.go | 19 +++++++++++++++---- src/runtime/runtime-gdb_test.go | 6 +++++- 2 files changed, 20 insertions(+), 5 deletions(-) (limited to 'src/runtime') diff --git a/src/runtime/crash_test.go b/src/runtime/crash_test.go index d5f755296b..6e00489b49 100644 --- a/src/runtime/crash_test.go +++ b/src/runtime/crash_test.go @@ -6,6 +6,7 @@ package runtime_test import ( "bytes" + "context" "errors" "flag" "fmt" @@ -18,6 +19,7 @@ import ( "strings" "sync" "testing" + "time" ) var toRemove []string @@ -58,18 +60,27 @@ func runTestProg(t *testing.T, binary, name string, env ...string) string { } func runBuiltTestProg(t *testing.T, exe, name string, env ...string) string { + t.Helper() + if *flagQuick { t.Skip("-quick") } - testenv.MustHaveGoBuild(t) - - cmd := testenv.CleanCmdEnv(exec.Command(exe, name)) + ctx, cancel := context.WithTimeout(context.Background(), time.Minute) + defer cancel() + cmd := testenv.CleanCmdEnv(testenv.CommandContext(t, ctx, exe, name)) cmd.Env = append(cmd.Env, env...) if testing.Short() { cmd.Env = append(cmd.Env, "RUNTIME_TEST_SHORT=1") } - out, _ := testenv.RunWithTimeout(t, cmd) + out, err := cmd.CombinedOutput() + if err != nil { + if _, ok := err.(*exec.ExitError); ok { + t.Logf("%v: %v", cmd, err) + } else { + t.Fatalf("%v failed to start: %v", cmd, err) + } + } return string(out) } diff --git a/src/runtime/runtime-gdb_test.go b/src/runtime/runtime-gdb_test.go index efc09c67e4..d3a30870c1 100644 --- a/src/runtime/runtime-gdb_test.go +++ b/src/runtime/runtime-gdb_test.go @@ -6,6 +6,7 @@ package runtime_test import ( "bytes" + "context" "fmt" "internal/testenv" "os" @@ -16,6 +17,7 @@ import ( "strconv" "strings" "testing" + "time" ) // NOTE: In some configurations, GDB will segfault when sent a SIGWINCH signal. @@ -428,7 +430,9 @@ func TestGdbBacktrace(t *testing.T) { "-ex", "continue", filepath.Join(dir, "a.exe"), } - got, err := testenv.RunWithTimeout(t, exec.Command("gdb", args...)) + ctx, cancel := context.WithTimeout(context.Background(), time.Minute) + defer cancel() + got, err := testenv.CommandContext(t, ctx, "gdb", args...).CombinedOutput() t.Logf("gdb output:\n%s", got) if err != nil { if bytes.Contains(got, []byte("internal-error: wait returned unexpected status 0x0")) { -- cgit v1.3