diff options
| author | Bryan C. Mills <bcmills@google.com> | 2022-04-29 16:56:12 -0400 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2022-04-30 02:35:50 +0000 |
| commit | 0ebe224628bdf336b68b3d1c255ff58df2b070b0 (patch) | |
| tree | 4966e05d284afe8cbc2ca7f8af3463b090c1fc07 /src | |
| parent | 11a650bb4aabfd7998b61df3ac33f61831d7abff (diff) | |
| download | go-0ebe224628bdf336b68b3d1c255ff58df2b070b0.tar.xz | |
os/signal: scale back the solaris-amd64-oraclerel settle time
The settleTime is arbitrary. Ideally we should refactor the test to
avoid it (using subprocesses instead of sleeps to isolate tests from
each others' delayed signals), but as a shorter-term workaround let's
try scaling it back to match linux/ppc64 (the other builder that
empirically requires a longer settleTime).
For #51054.
Updates #33174.
Change-Id: I574fffaadd74c52c13d63974e87f20b6d3cf3c4b
Reviewed-on: https://go-review.googlesource.com/c/go/+/403199
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Bryan Mills <bcmills@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Run-TryBot: Bryan Mills <bcmills@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/os/signal/signal_test.go | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/os/signal/signal_test.go b/src/os/signal/signal_test.go index 086ecdbcd5..fec6db72a9 100644 --- a/src/os/signal/signal_test.go +++ b/src/os/signal/signal_test.go @@ -47,11 +47,8 @@ func init() { // instead need a test-skip and upstream bug filed against the Solaris // kernel). // - // This constant is chosen so as to make the test as generous as possible - // while still reliably completing within 3 minutes in non-short mode. - // // See https://golang.org/issue/33174. - settleTime = 11 * time.Second + settleTime = 5 * time.Second } else if runtime.GOOS == "linux" && strings.HasPrefix(runtime.GOARCH, "ppc64") { // Older linux kernels seem to have some hiccups delivering the signal // in a timely manner on ppc64 and ppc64le. When running on a |