diff options
| author | Bryan C. Mills <bcmills@google.com> | 2022-10-26 11:44:34 -0400 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2022-10-31 20:54:10 +0000 |
| commit | e8ec68edfac4f50f57dd7faf039bb5c0f8eaba88 (patch) | |
| tree | d454c84525c510bddcf22ba7293099574dca8225 /src/runtime/runtime-gdb_test.go | |
| parent | 84cd7ab3c388fb3280cf426a35045d85cda99ff8 (diff) | |
| download | go-e8ec68edfac4f50f57dd7faf039bb5c0f8eaba88.tar.xz | |
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 <iant@google.com>
Run-TryBot: Bryan Mills <bcmills@google.com>
Auto-Submit: Bryan Mills <bcmills@google.com>
Reviewed-by: Austin Clements <austin@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Diffstat (limited to 'src/runtime/runtime-gdb_test.go')
| -rw-r--r-- | src/runtime/runtime-gdb_test.go | 6 |
1 files changed, 5 insertions, 1 deletions
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")) { |