]> Cypherpunks.ru repositories - gostls13.git/commit
[release-branch.go1.20] os/signal: remove go t.Run from TestNohup
authorMichael Pratt <mpratt@google.com>
Wed, 1 Nov 2023 21:06:08 +0000 (17:06 -0400)
committerCarlos Amedee <carlos@golang.org>
Thu, 7 Dec 2023 21:49:00 +0000 (21:49 +0000)
commit59ffd3b90d0ead2dc36f855f13bb37717d96dc2d
tree1aca84d1e42c120a722b21f4178a93b2e611e541
parent97c8ff8d53759e7a82b1862403df1694f2b6e073
[release-branch.go1.20] os/signal: remove go t.Run from TestNohup

Since CL 226138, TestNohup has a bit of a strange construction: it wants
to run the "uncaught" subtests in parallel with each other, and the
"nohup" subtests in parallel with each other, but also needs join
between "uncaught" and "nohop" so it can Stop notifying for SIGHUP.

It achieves this by doing `go t.Run` with a WaitGroup rather than using
`t.Parallel` in the subtest (which would make `t.Run` return immediately).

However, this makes things more difficult to understand than necessary.
As noted on https://pkg.go.dev/testing#hdr-Subtests_and_Sub_benchmarks,
a second layer of subtest can be used to join parallel subtests.

Switch to this form, which makes the test simpler to follow
(particularly the cleanup that goes with "uncaught").

For #63799.
For #63910.

Change-Id: Ibfce0f439508a7cfca848c7ccfd136c9c453ad8b
Reviewed-on: https://go-review.googlesource.com/c/go/+/538899
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
(cherry picked from commit 5622a4b2054664edcdd64974b9df73b440aedfae)
Reviewed-on: https://go-review.googlesource.com/c/go/+/546375
src/os/signal/signal_test.go