Merge pull request #14045 from Abirdcfly/main

fix minor unreachable code caused by t.Fatal

Author: shoenig

nomad/structs/structs_test.go

@@ -4325,7 +4325,6 @@ func TestTaskArtifact_Validate_Checksum(t *testing.T) {
 		err := tc.Input.Validate()
 		if (err != nil) != tc.Err {
 			t.Fatalf("case %d: %v", i, err)
-			continue
 		}
 	}
 }
@@ -6673,7 +6672,6 @@ func TestNodeReservedNetworkResources_ParseReserved(t *testing.T) {
 		out, err := r.ParseReservedHostPorts()
 		if (err != nil) != tc.Err {
 			t.Fatalf("test case %d: %v", i, err)
-			continue
 		}
 
 		require.Equal(out, tc.Parsed)

scheduler/feasible_test.go

@@ -34,8 +34,7 @@ func TestStaticIterator_Reset(t *testing.T) {
 
 		out := collectFeasible(static)
 		if len(out) != len(nodes) {
-			t.Fatalf("out: %#v", out)
-			t.Fatalf("missing nodes %d %#v", i, static)
+			t.Fatalf("out: %#v missing nodes %d %#v", out, i, static)
 		}
 
 		ids := make(map[string]struct{})

scheduler/generic_sched_test.go

@@ -64,10 +64,11 @@ func TestServiceSched_JobRegister(t *testing.T) {
 
 	// Ensure the eval has no spawned blocked eval
 	if len(h.CreateEvals) != 0 {
-		t.Fatalf("bad: %#v", h.CreateEvals)
+		t.Errorf("bad: %#v", h.CreateEvals)
 		if h.Evals[0].BlockedEval != "" {
 			t.Fatalf("bad: %#v", h.Evals[0])
 		}
+		t.FailNow()
 	}
 
 	// Ensure the plan allocated
@@ -1517,10 +1518,11 @@ func TestServiceSched_EvaluateBlockedEval_Finished(t *testing.T) {
 
 	// Ensure the eval has no spawned blocked eval
 	if len(h.Evals) != 1 {
-		t.Fatalf("bad: %#v", h.Evals)
+		t.Errorf("bad: %#v", h.Evals)
 		if h.Evals[0].BlockedEval != "" {
 			t.Fatalf("bad: %#v", h.Evals[0])
 		}
+		t.FailNow()
 	}
 
 	// Ensure the plan allocated