Fix up test

system_test/cluster_test.go

@@ -1147,6 +1147,8 @@ func Test_MultiNodeClusterSnapshot(t *testing.T) {
 		}
 	}
 
+	expResults := `{"results":[{"columns":["COUNT(*)"],"types":["integer"],"values":[[500]]}]}`
+
 	// Join a second node, check it gets the data via a snapshot.
 	node2 := mustNewNode(false)
 	defer node2.Deprovision()
@@ -1162,12 +1164,13 @@ func Test_MultiNodeClusterSnapshot(t *testing.T) {
 		if err != nil {
 			return false, err
 		}
-		if r != `{"results":[{"columns":["COUNT(*)"],"types":["integer"],"values":[[500]]}]}` {
+		if r != expResults {
 			return false, nil
 		}
 		return true, nil
 	}, 100*time.Millisecond, 5*time.Second)
 
+	// Create and add a third node to the cluster.
 	node3 := mustNewNode(false)
 	defer node3.Deprovision()
 	if err := node3.Join(node1); err != nil {
@@ -1197,7 +1200,7 @@ func Test_MultiNodeClusterSnapshot(t *testing.T) {
 				t.Fatalf("failed to query follower node: %s", err.Error())
 			}
 
-			if r != `{"results":[{"columns":["COUNT(*)"],"types":["integer"],"values":[[300]]}]}` {
+			if r != expResults {
 				if n < 10 {
 					// Wait, and try again.
 					sleepForSecond()
@@ -1229,7 +1232,7 @@ func Test_MultiNodeClusterSnapshot(t *testing.T) {
 			t.Fatalf("failed to query follower node: %s", err.Error())
 		}
 
-		if r != `{"results":[{"columns":["COUNT(*)"],"types":["integer"],"values":[[300]]}]}` {
+		if r != expResults {
 			if n < 10 {
 				// Wait, and try again.
 				sleepForSecond()

system_test/single_node_test.go

@@ -1219,13 +1219,10 @@ func Test_SingleNodeNoopSnapReopen(t *testing.T) {
 // This tests that the code can handle a snapshot that doesn't
 // contain database data. This shouldn't happen in real systems
 func Test_SingleNodeNoopSnapLogsReopen(t *testing.T) {
-	var raftAddr string
 	dir := mustTempDir()
 	mux, ln := mustNewOpenMux("")
 	defer ln.Close()
 	node := mustNodeEncrypted(dir, true, false, mux, "")
-	raftAddr = node.RaftAddr
-	t.Logf("node listening for Raft on %s", raftAddr)
 
 	if _, err := node.WaitForLeader(); err != nil {
 		t.Fatalf("node never became leader")