firewalldb: ensure that test SQL store is closed

We add a helper function to the functions that creates the test SQL
stores, in order to ensure that the store is properly closed when the
test is cleaned up.

Author: ViktorTigerstrom

firewalldb/actions_test.go

@@ -28,9 +28,6 @@ func TestActionStorage(t *testing.T) {
 	sessDB := session.NewTestDBWithAccounts(t, clock, accountsDB)
 
 	db := NewTestDBWithSessionsAndAccounts(t, sessDB, accountsDB, clock)
-	t.Cleanup(func() {
-		_ = db.Close()
-	})
 
 	// Assert that attempting to add an action for a session that does not
 	// exist returns an error.
@@ -198,9 +195,6 @@ func TestListActions(t *testing.T) {
 	sessDB := session.NewTestDB(t, clock)
 
 	db := NewTestDBWithSessions(t, sessDB, clock)
-	t.Cleanup(func() {
-		_ = db.Close()
-	})
 
 	// Add 2 sessions that we can reference.
 	sess1, err := sessDB.NewSession(
@@ -466,9 +460,6 @@ func TestListGroupActions(t *testing.T) {
 	}
 
 	db := NewTestDBWithSessions(t, sessDB, clock)
-	t.Cleanup(func() {
-		_ = db.Close()
-	})
 
 	// There should not be any actions in group 1 yet.
 	al, _, _, err := db.ListActions(ctx, nil, WithActionGroupID(group1))

firewalldb/test_postgres.go

@@ -11,11 +11,11 @@ import (
 
 // NewTestDB is a helper function that creates an BBolt database for testing.
 func NewTestDB(t *testing.T, clock clock.Clock) *SQLDB {
-	return NewSQLDB(db.NewTestPostgresDB(t).BaseDB, clock)
+	return createStore(t, db.NewTestPostgresDB(t).BaseDB, clock)
 }
 
 // NewTestDBFromPath is a helper function that creates a new BoltStore with a
 // connection to an existing BBolt database for testing.
 func NewTestDBFromPath(t *testing.T, _ string, clock clock.Clock) *SQLDB {
-	return NewSQLDB(db.NewTestPostgresDB(t).BaseDB, clock)
+	return createStore(t, db.NewTestPostgresDB(t).BaseDB, clock)
 }

firewalldb/test_sql.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/lightninglabs/lightning-terminal/accounts"
+	"github.com/lightninglabs/lightning-terminal/db"
 	"github.com/lightninglabs/lightning-terminal/session"
 	"github.com/lightningnetwork/lnd/clock"
 	"github.com/stretchr/testify/require"
@@ -20,7 +21,7 @@ func NewTestDBWithSessions(t *testing.T, sessionStore session.Store,
 	sessions, ok := sessionStore.(*session.SQLStore)
 	require.True(t, ok)
 
-	return NewSQLDB(sessions.BaseDB, clock)
+	return createStore(t, sessions.BaseDB, clock)
 }
 
 // NewTestDBWithSessionsAndAccounts creates a new test SQLDB Store with access
@@ -36,7 +37,7 @@ func NewTestDBWithSessionsAndAccounts(t *testing.T, sessionStore SessionDB,
 
 	require.Equal(t, accounts.BaseDB, sessions.BaseDB)
 
-	return NewSQLDB(sessions.BaseDB, clock)
+	return createStore(t, sessions.BaseDB, clock)
 }
 
 func assertEqualActions(t *testing.T, expected, got *Action) {
@@ -52,3 +53,14 @@ func assertEqualActions(t *testing.T, expected, got *Action) {
 	expected.AttemptedAt = expectedAttemptedAt
 	got.AttemptedAt = actualAttemptedAt
 }
+
+// createStore is a helper function that creates a new SQLDB and ensure that
+// it is closed when during the test cleanup.
+func createStore(t *testing.T, sqlDB *db.BaseDB, clock clock.Clock) *SQLDB {
+	store := NewSQLDB(sqlDB, clock)
+	t.Cleanup(func() {
+		require.NoError(t, store.Close())
+	})
+
+	return store
+}

firewalldb/test_sqlite.go

@@ -11,13 +11,13 @@ import (
 
 // NewTestDB is a helper function that creates an BBolt database for testing.
 func NewTestDB(t *testing.T, clock clock.Clock) *SQLDB {
-	return NewSQLDB(db.NewTestSqliteDB(t).BaseDB, clock)
+	return createStore(t, db.NewTestSqliteDB(t).BaseDB, clock)
 }
 
 // NewTestDBFromPath is a helper function that creates a new BoltStore with a
 // connection to an existing BBolt database for testing.
 func NewTestDBFromPath(t *testing.T, dbPath string, clock clock.Clock) *SQLDB {
-	return NewSQLDB(
-		db.NewTestSqliteDbHandleFromPath(t, dbPath).BaseDB, clock,
+	return createStore(
+		t, db.NewTestSqliteDbHandleFromPath(t, dbPath).BaseDB, clock,
 	)
 }