From bbab863ada264642e2755f123ef3f84a6b3451d0 Mon Sep 17 00:00:00 2001 From: Michael Pratt Date: Wed, 1 Nov 2023 11:55:10 -0400 Subject: [release-branch.go1.21] os/signal: skip nohup tests on darwin builders The new LUCI builders have a temporary limitation that breaks nohup. Skip nohup tests there. For #63875. Fixes #63911. Cq-Include-Trybots: luci.golang.try:go1.21-darwin-amd64_13 Change-Id: Ia9ffecea7310f84a21f6138d8f8cdfc5e1392307 Reviewed-on: https://go-review.googlesource.com/c/go/+/538698 Reviewed-by: Dmitri Shuralyov Reviewed-by: Dmitri Shuralyov LUCI-TryBot-Result: Go LUCI Reviewed-by: Bryan Mills (cherry picked from commit a334c452731e7becc2dc879e253c7198202af126) Reviewed-on: https://go-review.googlesource.com/c/go/+/546022 --- src/os/signal/signal_test.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/os/signal/signal_test.go b/src/os/signal/signal_test.go index 114b253d73..c7c42ed255 100644 --- a/src/os/signal/signal_test.go +++ b/src/os/signal/signal_test.go @@ -308,6 +308,7 @@ func TestDetectNohup(t *testing.T) { t.Errorf("ran test with -check_sighup_ignored and it succeeded: expected failure.\nOutput:\n%s", out) } Stop(c) + // Again, this time with nohup, assuming we can find it. _, err := os.Stat("/usr/bin/nohup") if err != nil { @@ -320,6 +321,13 @@ func TestDetectNohup(t *testing.T) { data, _ := os.ReadFile("nohup.out") os.Remove("nohup.out") if err != nil { + // nohup doesn't work on new LUCI darwin builders due to the + // type of launchd service the test run under. See + // https://go.dev/issue/63875. + if runtime.GOOS == "darwin" && strings.Contains(string(out), "nohup: can't detach from console: Inappropriate ioctl for device") { + t.Skip("Skipping nohup test due to darwin builder limitation. See https://go.dev/issue/63875.") + } + t.Errorf("ran test with -check_sighup_ignored under nohup and it failed: expected success.\nError: %v\nOutput:\n%s%s", err, out, data) } } @@ -498,6 +506,16 @@ func TestNohup(t *testing.T) { out, err := testenv.Command(t, "nohup", args...).CombinedOutput() if err != nil { + // nohup doesn't work on new LUCI darwin builders due to the + // type of launchd service the test run under. See + // https://go.dev/issue/63875. + if runtime.GOOS == "darwin" && strings.Contains(string(out), "nohup: can't detach from console: Inappropriate ioctl for device") { + // TODO(go.dev/issue/63799): A false-positive in vet reports a + // t.Skip here as invalid. Switch back to t.Skip once fixed. + t.Logf("Skipping nohup test due to darwin builder limitation. See https://go.dev/issue/63875.") + return + } + t.Errorf("ran test with -send_uncaught_sighup=%d under nohup and it failed: expected success.\nError: %v\nOutput:\n%s", i, err, out) } else { t.Logf("ran test with -send_uncaught_sighup=%d under nohup.\nOutput:\n%s", i, out) -- cgit v1.2.3-54-g00ecf