Fix system-level tests

system_test/helpers.go

@@ -510,10 +510,17 @@ func mustNodeEncryptedOnDisk(dir string, enableSingle, httpEncrypt bool, mux *tc
 	node.Store.SnapshotThreshold = 100
 	node.Store.SnapshotInterval = SnapshotInterval
 
-	if err := node.Store.Open(enableSingle); err != nil {
+	if err := node.Store.Open(); err != nil {
 		node.Deprovision()
 		panic(fmt.Sprintf("failed to open store: %s", err.Error()))
 	}
+	if enableSingle {
+		if err := node.Store.Bootstrap(store.NewServer(node.Store.ID(), node.Store.Addr(), true)); err != nil {
+			node.Deprovision()
+			panic(fmt.Sprintf("failed to bootstrap store: %s", err.Error()))
+		}
+	}
+
 	node.RaftAddr = node.Store.Addr()
 	node.ID = node.Store.ID()
 

system_test/single_node_test.go

@@ -10,6 +10,8 @@ import (
 	"sync"
 	"testing"
 	"time"
+
+	"github.com/rqlite/rqlite/store"
 )
 
 func Test_SingleNodeBasicEndpoint(t *testing.T) {
@@ -555,9 +557,12 @@ func Test_SingleNodeReopen(t *testing.T) {
 			t.Fatalf("failed to close node")
 		}
 
-		if err := node.Store.Open(true); err != nil {
+		if err := node.Store.Open(); err != nil {
 			t.Fatalf("failed to re-open store: %s", err)
 		}
+		if err := node.Store.Bootstrap(store.NewServer(node.Store.ID(), node.Store.Addr(), true)); err != nil {
+			t.Fatalf("failed to bootstrap single-node store: %s", err.Error())
+		}
 		if err := node.Service.Start(); err != nil {
 			t.Fatalf("failed to restart service: %s", err)
 		}
@@ -600,9 +605,12 @@ func Test_SingleNodeNoopReopen(t *testing.T) {
 			t.Fatalf("failed to close node")
 		}
 
-		if err := node.Store.Open(true); err != nil {
+		if err := node.Store.Open(); err != nil {
 			t.Fatalf("failed to re-open store: %s", err)
 		}
+		if err := node.Store.Bootstrap(store.NewServer(node.Store.ID(), node.Store.Addr(), true)); err != nil {
+			t.Fatalf("failed to bootstrap single-node store: %s", err.Error())
+		}
 		if err := node.Service.Start(); err != nil {
 			t.Fatalf("failed to restart service: %s", err)
 		}
@@ -694,9 +702,12 @@ func Test_SingleNodeNoopSnapReopen(t *testing.T) {
 			t.Fatalf("failed to close node")
 		}
 
-		if err := node.Store.Open(true); err != nil {
+		if err := node.Store.Open(); err != nil {
 			t.Fatalf("failed to re-open store: %s", err)
 		}
+		if err := node.Store.Bootstrap(store.NewServer(node.Store.ID(), node.Store.Addr(), true)); err != nil {
+			t.Fatalf("failed to bootstrap single-node store: %s", err.Error())
+		}
 		if err := node.Service.Start(); err != nil {
 			t.Fatalf("failed to restart service: %s", err)
 		}
@@ -795,7 +806,7 @@ func Test_SingleNodeNoopSnapLogsReopen(t *testing.T) {
 			t.Fatalf("failed to close node")
 		}
 
-		if err := node.Store.Open(true); err != nil {
+		if err := node.Store.Open(); err != nil {
 			t.Fatalf("failed to re-open store: %s", err)
 		}
 		if err := node.Service.Start(); err != nil {