From 04db81951fd0f6b7cc543410585a4da0d70a354a Mon Sep 17 00:00:00 2001 From: Daniel Bennett Date: Tue, 11 Mar 2025 12:01:39 -0400 Subject: [PATCH] test: fix go 1.24 test complaints (#25346) e.g. Error: nomad/leader_test.go:382:12: non-constant format string in call to (*testing.common).Fatalf --- client/allocrunner/checks_hook_test.go | 6 +++--- client/allocrunner/taskrunner/task_runner_test.go | 4 ++-- client/client_test.go | 12 ++++++------ client/consul/consul_test.go | 4 ++-- command/agent/alloc_endpoint_test.go | 3 ++- command/agent/retry_join_test.go | 2 +- command/helpers_test.go | 4 ++-- go.mod | 2 +- nomad/leader_test.go | 8 ++++---- 9 files changed, 23 insertions(+), 22 deletions(-) diff --git a/client/allocrunner/checks_hook_test.go b/client/allocrunner/checks_hook_test.go index 581311933..948e6e287 100644 --- a/client/allocrunner/checks_hook_test.go +++ b/client/allocrunner/checks_hook_test.go @@ -206,7 +206,7 @@ func TestCheckHook_Checks_ResultsSet(t *testing.T) { return true, nil }, func(err error) { - t.Fatalf(err.Error()) + t.Fatal(err) }, ) @@ -271,7 +271,7 @@ func TestCheckHook_Checks_UpdateSet(t *testing.T) { return true, nil }, func(err error) { - t.Fatalf(err.Error()) + t.Fatal(err) }, ) @@ -308,7 +308,7 @@ func TestCheckHook_Checks_UpdateSet(t *testing.T) { return true, nil }, func(err error) { - t.Fatalf(err.Error()) + t.Fatal(err) }, ) diff --git a/client/allocrunner/taskrunner/task_runner_test.go b/client/allocrunner/taskrunner/task_runner_test.go index 2b7807094..c922e1db4 100644 --- a/client/allocrunner/taskrunner/task_runner_test.go +++ b/client/allocrunner/taskrunner/task_runner_test.go @@ -2047,10 +2047,10 @@ func TestTaskRunner_DriverNetwork(t *testing.T) { }, func(err error) { services, _ := consulAgent.ServicesWithFilterOpts("", nil) for _, s := range services { - t.Logf(pretty.Sprint("Service: ", s)) + t.Log(pretty.Sprint("Service: ", s)) } for _, c := range consulAgent.CheckRegs() { - t.Logf(pretty.Sprint("Check: ", c)) + t.Log(pretty.Sprint("Check: ", c)) } require.NoError(t, err) }) diff --git a/client/client_test.go b/client/client_test.go index bc3d3e048..270d300c0 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -352,7 +352,7 @@ func TestClient_MixedTLS(t *testing.T) { return true, nil }, func(err error) { - t.Fatalf(err.Error()) + t.Fatal(err) }, ) } @@ -414,7 +414,7 @@ func TestClient_BadTLS(t *testing.T) { return true, nil }, func(err error) { - t.Fatalf(err.Error()) + t.Fatal(err) }, ) } @@ -1271,7 +1271,7 @@ func TestClient_ReloadTLS_UpgradePlaintextToTLS(t *testing.T) { return true, nil }, func(err error) { - t.Fatalf(err.Error()) + t.Fatal(err) }, ) } @@ -1304,7 +1304,7 @@ func TestClient_ReloadTLS_UpgradePlaintextToTLS(t *testing.T) { return true, nil }, func(err error) { - t.Fatalf(err.Error()) + t.Fatal(err) }, ) } @@ -1357,7 +1357,7 @@ func TestClient_ReloadTLS_DowngradeTLSToPlaintext(t *testing.T) { } return true, nil }, func(err error) { - t.Fatalf(err.Error()) + t.Fatal(err) }, ) } @@ -1382,7 +1382,7 @@ func TestClient_ReloadTLS_DowngradeTLSToPlaintext(t *testing.T) { } return true, nil }, func(err error) { - t.Fatalf(err.Error()) + t.Fatal(err) }, ) } diff --git a/client/consul/consul_test.go b/client/consul/consul_test.go index 1cd25fcc0..778775782 100644 --- a/client/consul/consul_test.go +++ b/client/consul/consul_test.go @@ -54,12 +54,12 @@ func newMockConsulServer() *mockConsulServer { SecretID: secretID, } buf, _ := json.Marshal(token) - fmt.Fprintf(w, string(buf)) + fmt.Fprint(w, string(buf)) return } w.WriteHeader(srv.errorCodeOnTokenSelf) - fmt.Fprintf(w, "{}") + fmt.Fprint(w, "{}") }) srv.httpSrv = httptest.NewServer(mux) diff --git a/command/agent/alloc_endpoint_test.go b/command/agent/alloc_endpoint_test.go index fa5014dcd..135a1ee28 100644 --- a/command/agent/alloc_endpoint_test.go +++ b/command/agent/alloc_endpoint_test.go @@ -6,6 +6,7 @@ package agent import ( "archive/tar" "context" + "errors" "fmt" "io" "net/http" @@ -759,7 +760,7 @@ func TestHTTP_AllocSnapshot_Atomic(t *testing.T) { return false, err } - return serverAlloc.ClientStatus == structs.AllocClientStatusRunning, fmt.Errorf(serverAlloc.ClientStatus) + return serverAlloc.ClientStatus == structs.AllocClientStatusRunning, errors.New(serverAlloc.ClientStatus) }, func(err error) { t.Fatalf("client not running alloc: %v", err) }) diff --git a/command/agent/retry_join_test.go b/command/agent/retry_join_test.go index 8c9fc5200..879e810fb 100644 --- a/command/agent/retry_join_test.go +++ b/command/agent/retry_join_test.go @@ -92,7 +92,7 @@ func TestRetryJoin_Integration(t *testing.T) { } return true, nil }, func(err error) { - t.Fatalf(err.Error()) + t.Fatal(err) }) } diff --git a/command/helpers_test.go b/command/helpers_test.go index 3959c39bc..52cce0780 100644 --- a/command/helpers_test.go +++ b/command/helpers_test.go @@ -411,9 +411,9 @@ func TestJobGetter_HTTPServer(t *testing.T) { } if !reflect.DeepEqual(expectedApiJob, aj) { for _, d := range pretty.Diff(expectedApiJob, aj) { - t.Logf(d) + t.Log(d) } - t.Fatalf("Unexpected file") + t.Fatal("Unexpected file") } } diff --git a/go.mod b/go.mod index aed39d2c1..b2848e857 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/nomad -go 1.23.6 +go 1.24 // Pinned dependencies are noted in github.com/hashicorp/nomad/issues/11826. replace ( diff --git a/nomad/leader_test.go b/nomad/leader_test.go index 0cc81de24..b8dd84711 100644 --- a/nomad/leader_test.go +++ b/nomad/leader_test.go @@ -369,17 +369,17 @@ func TestLeader_PeriodicDispatcher_Restore_Adds(t *testing.T) { leader.periodicDispatcher.l.Lock() defer leader.periodicDispatcher.l.Unlock() if _, tracked := leader.periodicDispatcher.tracked[tuplePeriodic]; !tracked { - return false, fmt.Errorf("periodic job not tracked") + return false, errors.New("periodic job not tracked") } if _, tracked := leader.periodicDispatcher.tracked[tupleNonPeriodic]; tracked { - return false, fmt.Errorf("non periodic job tracked") + return false, errors.New("non periodic job tracked") } if _, tracked := leader.periodicDispatcher.tracked[tupleParameterized]; tracked { - return false, fmt.Errorf("parameterized periodic job tracked") + return false, errors.New("parameterized periodic job tracked") } return true, nil }, func(err error) { - t.Fatalf(err.Error()) + t.Fatal(err) }) }