diff --git a/cmd/wicket/connect_signal_test.go b/cmd/wicket/connect_signal_test.go index 1e0c0d0..07ae265 100644 --- a/cmd/wicket/connect_signal_test.go +++ b/cmd/wicket/connect_signal_test.go @@ -146,7 +146,12 @@ func TestConnect_SignalStopsTheClientGroup(t *testing.T) { t.Fatal(err) } select { - case <-exited: + case err := <-exited: + if err != nil { + if _, ok := errors.AsType[*exec.ExitError](err); !ok { + t.Fatalf("wait: %v", err) + } + } case <-time.After(15 * time.Second): t.Fatalf("wicket connect still running after %v", tc.sig) } diff --git a/install_test.go b/install_test.go index a48e73c..0595516 100644 --- a/install_test.go +++ b/install_test.go @@ -1186,8 +1186,8 @@ func (in *installer) signalDuring(t *testing.T, ready <-chan struct{}, s signal) t.Fatalf("install.sh exited early: %v\n%s", err, out) case <-time.After(10 * time.Second): cancel() - <-done - t.Fatalf("install.sh never reached the point to signal it:\n%s", out) + err := <-done + t.Fatalf("install.sh never reached the point to signal it: %v\n%s", err, out) } pid := cmd.Process.Pid if s.group { @@ -1204,7 +1204,7 @@ func (in *installer) signalDuring(t *testing.T, ready <-chan struct{}, s signal) } case <-time.After(within): cancel() - <-done - t.Errorf("install.sh still running %v after %v\n%s", within, s.sig, out) + err := <-done + t.Errorf("install.sh still running %v after %v: %v\n%s", within, s.sig, err, out) } } diff --git a/mise.toml b/mise.toml index 352655b..1e59bc5 100644 --- a/mise.toml +++ b/mise.toml @@ -4,13 +4,13 @@ # go.mod toolchain line. [tools] go = "1.27.3" -golangci-lint = "2.14.0" +golangci-lint = "2.15.0" "go:golang.org/x/vuln/cmd/govulncheck" = "1.9.0" jq = "1.8.2" -"go:golang.org/x/tools/gopls" = "0.23.0" +"go:golang.org/x/tools/gopls" = "0.24.0" "go:golang.org/x/tools/cmd/deadcode" = "0.52.0" shellcheck = "0.11.0" -lefthook = "2.1.7" +lefthook = "2.2.2" [env] # Use exactly the pinned Go; never let an inherited GOTOOLCHAIN switch versions.