fix go test complaints

hashicorp · Mar 10, 2025 · 29e0d3a · 29e0d3a
1 parent 832a578
commit 29e0d3a
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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)
 	})
 }