Merge 26e2bfd into b549227

server/clustering_test.go

@@ -86,7 +86,7 @@ func getTestDefaultOptsForClustering(id string, bootstrap bool) *Options {
 		// IDs, make sure that if someone adds a test with a new ID
 		// he/she adds it to the list of database names to create on
 		// test startup.
-		ok := false
+		var ok bool
 		suffix := "_" + id
 		for _, n := range testDBSuffixes {
 			if suffix == n {
@@ -152,6 +152,7 @@ func verifyNoLeader(t *testing.T, timeout time.Duration, servers ...*StanServer)
 	deadline := time.Now().Add(timeout)
 	var leader *StanServer
 	for time.Now().Before(deadline) {
+		leader = nil
 		for _, server := range servers {
 			if server.raft == nil {
 				continue
@@ -162,7 +163,9 @@ func verifyNoLeader(t *testing.T, timeout time.Duration, servers ...*StanServer)
 				break
 			}
 		}
-		return
+		if leader == nil {
+			return
+		}
 	}
 	stackFatalf(t, "Found unexpected leader %q", leader.info.NodeID)
 }

server/server_test.go

@@ -186,6 +186,8 @@ func init() {
 func stackFatalf(t tLogger, f string, args ...interface{}) {
 	msg := fmt.Sprintf(f, args...) + "\n" + stack()
 	t.Fatalf(msg)
+	// For staticcheck SA0511...
+	panic("unreachable code")
 }
 
 func stack() string {

stores/common_test.go

@@ -100,6 +100,8 @@ func stackFatalf(t tLogger, f string, args ...interface{}) {
 	}
 
 	t.Fatalf("%s", strings.Join(lines, "\n"))
+	// For staticcheck SA0511...
+	panic("unreachable code")
 }
 
 func msgStoreLookup(t tLogger, ms MsgStore, seq uint64) *pb.MsgProto {

test/test.go

@@ -42,4 +42,6 @@ func StackFatalf(t TLogger, f string, args ...interface{}) {
 	}
 
 	t.Fatalf("%s", strings.Join(lines, "\n"))
+	// For staticcheck SA0511...
+	panic("unreachable code")
 }

util/util_test.go

@@ -46,6 +46,8 @@ func stackFatalf(t *testing.T, f string, args ...interface{}) {
 	}
 
 	t.Fatalf("%s", strings.Join(lines, "\n"))
+	// For staticcheck SA0511...
+	panic("unreachable code")
 }
 
 func TestEnsureBufBigEnough(t *testing.T) {