4 files changed, 23 insertions, 17 deletions
diff --git a/internal/praefect/nodes/health_manager_test.go b/internal/praefect/nodes/health_manager_test.go
index 4e4a4bf0e..07b359090 100644
--- a/internal/praefect/nodes/health_manager_test.go
+++ b/internal/praefect/nodes/health_manager_test.go
@@ -24,6 +24,7 @@ func (m mockHealthClient) Check(ctx context.Context, r *grpc_health_v1.HealthChe
 }
 
 func TestHealthManager(t *testing.T) {
+	t.Parallel()
 	ctx, cancel := testhelper.Context()
 	defer cancel()
 
@@ -37,6 +38,8 @@ func TestHealthManager(t *testing.T) {
 		HealthConsensus map[string][]string
 	}
 
+	db := glsql.NewDB(t)
+
 	for _, tc := range []struct {
 		desc         string
 		healthChecks HealthChecks
@@ -470,7 +473,7 @@ func TestHealthManager(t *testing.T) {
 		},
 	} {
 		t.Run(tc.desc, func(t *testing.T) {
-			db := getDB(t)
+			db.TruncateAll(t)
 
 			healthStatus := map[string]grpc_health_v1.HealthCheckResponse_ServingStatus{}
 			// healthManagers are cached in order to keep the internal state intact between different
diff --git a/internal/praefect/nodes/init_test.go b/internal/praefect/nodes/init_test.go
index 7ec527cb8..678b275ea 100644
--- a/internal/praefect/nodes/init_test.go
+++ b/internal/praefect/nodes/init_test.go
@@ -4,7 +4,6 @@ import (
 	"os"
 	"testing"
 
-	"gitlab.com/gitlab-org/gitaly/v14/internal/praefect/datastore/glsql"
 	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper"
 )
 
@@ -18,5 +17,3 @@ func testMain(m *testing.M) (code int) {
 	defer cleanup()
 	return m.Run()
 }
-
-func getDB(t testing.TB) glsql.DB { return glsql.GetDB(t) }
diff --git a/internal/praefect/nodes/per_repository_test.go b/internal/praefect/nodes/per_repository_test.go
index 0ed62e266..b37071251 100644
--- a/internal/praefect/nodes/per_repository_test.go
+++ b/internal/praefect/nodes/per_repository_test.go
@@ -14,6 +14,7 @@ import (
 )
 
 func TestPerRepositoryElector(t *testing.T) {
+	t.Parallel()
 	ctx, cancel := testhelper.Context()
 	defer cancel()
 
@@ -45,6 +46,8 @@ func TestPerRepositoryElector(t *testing.T) {
 		primary      matcher
 	}
 
+	db := glsql.NewDB(t)
+
 	for _, tc := range []struct {
 		desc         string
 		state        state
@@ -482,7 +485,7 @@ func TestPerRepositoryElector(t *testing.T) {
 		},
 	} {
 		t.Run(tc.desc, func(t *testing.T) {
-			db := getDB(t)
+			db.TruncateAll(t)
 
 			rs := datastore.NewPostgresRepositoryStore(db, nil)
 			for virtualStorage, relativePaths := range tc.state {
diff --git a/internal/praefect/nodes/sql_elector_test.go b/internal/praefect/nodes/sql_elector_test.go
index fb649f934..09d0a89c2 100644
--- a/internal/praefect/nodes/sql_elector_test.go
+++ b/internal/praefect/nodes/sql_elector_test.go
@@ -28,7 +28,8 @@ import (
 var shardName string = "test-shard-0"
 
 func TestGetPrimaryAndSecondaries(t *testing.T) {
-	db := getDB(t)
+	t.Parallel()
+	db := glsql.NewDB(t)
 
 	logger := testhelper.NewTestLogger(t).WithField("test", t.Name())
 	praefectSocket := testhelper.GetTemporaryGitalySocketFileName(t)
@@ -71,7 +72,8 @@ func TestGetPrimaryAndSecondaries(t *testing.T) {
 }
 
 func TestSqlElector_slow_execution(t *testing.T) {
-	db := getDB(t)
+	t.Parallel()
+	db := glsql.NewDB(t)
 
 	praefectSocket := "unix://" + testhelper.GetTemporaryGitalySocketFileName(t)
 	logger := testhelper.NewTestLogger(t).WithField("test", t.Name())
@@ -108,7 +110,8 @@ func TestSqlElector_slow_execution(t *testing.T) {
 }
 
 func TestBasicFailover(t *testing.T) {
-	db := getDB(t)
+	t.Parallel()
+	db := glsql.NewDB(t)
 
 	logger := testhelper.NewTestLogger(t).WithField("test", t.Name())
 	praefectSocket := testhelper.GetTemporaryGitalySocketFileName(t)
@@ -216,16 +219,15 @@ func TestBasicFailover(t *testing.T) {
 }
 
 func TestElectDemotedPrimary(t *testing.T) {
-	db := getDB(t)
-
-	tx := getDB(t).Begin(t)
+	t.Parallel()
+	tx := glsql.NewDB(t).Begin(t)
 	defer tx.Rollback(t)
 
 	node := config.Node{Storage: "gitaly-0"}
 	elector := newSQLElector(
 		shardName,
 		config.Config{},
-		db.DB,
+		nil,
 		testhelper.DiscardTestLogger(t),
 		[]*nodeStatus{{node: node}},
 	)
@@ -283,7 +285,8 @@ func predateElection(t testing.TB, ctx context.Context, db glsql.Querier, shardN
 }
 
 func TestElectNewPrimary(t *testing.T) {
-	db := getDB(t)
+	t.Parallel()
+	db := glsql.NewDB(t)
 
 	ns := []*nodeStatus{{
 		node: config.Node{
@@ -395,9 +398,7 @@ func TestElectNewPrimary(t *testing.T) {
 
 	for _, testCase := range testCases {
 		t.Run(testCase.desc, func(t *testing.T) {
-			db.TruncateAll(t)
-
-			tx := getDB(t).Begin(t)
+			tx := db.Begin(t)
 			defer tx.Rollback(t)
 
 			_, err := tx.Exec(testCase.initialReplQueueInsert)
@@ -423,6 +424,7 @@ func TestElectNewPrimary(t *testing.T) {
 }
 
 func TestConnectionMultiplexing(t *testing.T) {
+	t.Parallel()
 	errNonMuxed := status.Error(codes.Internal, "non-muxed connection")
 	errMuxed := status.Error(codes.Internal, "muxed connection")
 
@@ -453,6 +455,7 @@ func TestConnectionMultiplexing(t *testing.T) {
 
 	go srv.Serve(ln)
 
+	db := glsql.NewDB(t)
 	mgr, err := NewManager(
 		testhelper.DiscardTestEntry(t),
 		config.Config{
@@ -470,7 +473,7 @@ func TestConnectionMultiplexing(t *testing.T) {
 				},
 			},
 		},
-		getDB(t).DB,
+		db.DB,
 		nil,
 		promtest.NewMockHistogramVec(),
 		protoregistry.GitalyProtoPreregistered,