Add sqlite cleanup

netbirdio · Jun 12, 2024 · 64909be · 64909be
1 parent 14639af
commit 64909be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/client/internal/engine_test.go b/client/internal/engine_test.go
@@ -816,7 +816,7 @@ func TestEngine_MultiplePeers(t *testing.T) {
 		return
 	}
 	defer sigServer.Stop()
-	mgmtServer, mgmtAddr, err := startManagement(dir)
+	mgmtServer, mgmtAddr, err := startManagement(t, dir)
 	if err != nil {
 		t.Fatal(err)
 		return
@@ -1032,7 +1032,9 @@ func startSignal() (*grpc.Server, string, error) {
 	return s, lis.Addr().String(), nil
 }
 
-func startManagement(dataDir string) (*grpc.Server, string, error) {
+func startManagement(t *testing.T, dataDir string) (*grpc.Server, string, error) {
+	t.Helper()
+
 	config := &server.Config{
 		Stuns:      []*server.Host{},
 		TURNConfig: &server.TURNConfig{},
@@ -1049,10 +1051,12 @@ func startManagement(dataDir string) (*grpc.Server, string, error) {
 		return nil, "", err
 	}
 	s := grpc.NewServer(grpc.KeepaliveEnforcementPolicy(kaep), grpc.KeepaliveParams(kasp))
-	store, _, err := server.NewTestStoreFromJson(config.Datadir)
+
+	store, cleanUp, err := server.NewTestStoreFromJson(config.Datadir)
 	if err != nil {
 		return nil, "", err
 	}
+	t.Cleanup(cleanUp)
 
 	peersUpdateManager := server.NewPeersUpdateManager(nil)
 	eventStore := &activity.InMemoryEventStore{}

diff --git a/management/server/store.go b/management/server/store.go
@@ -196,9 +196,7 @@ func NewTestStoreFromJson(dataDir string) (Store, func(), error) {
 
 	var (
 		store   Store
-		cleanUp = func() {
-			// empty store cleanUp
-		}
+		cleanUp func()
 	)
 
 	if kind == PostgresStoreEngine {
@@ -221,6 +219,7 @@ func NewTestStoreFromJson(dataDir string) (Store, func(), error) {
 		if err != nil {
 			return nil, nil, err
 		}
+		cleanUp = func() { store.Close() }
 	}
 
 	return store, cleanUp, nil