Fix sqlite unit test parallelization issues

.gitignore

@@ -56,6 +56,7 @@ dendrite.yaml
 
 # Database files
 *.db
+*.db-journal
 
 # Log files
 *.log*

federationapi/routing/routing.go

@@ -67,9 +67,11 @@ func Setup(
 	servers federationAPI.ServersInRoomProvider,
 	producer *producers.SyncAPIProducer,
 ) {
+	if cfg.Matrix.Metrics.Enabled {
 		prometheus.MustRegister(
 			internal.PDUCountTotal, internal.EDUCountTotal,
 		)
+	}
 
 	v2keysmux := keyMux.PathPrefix("/v2").Subrouter()
 	v1fedmux := fedMux.PathPrefix("/v1").Subrouter()

federationapi/routing/send_test.go

@@ -546,7 +546,8 @@ type sendContent struct {
 }
 
 func TestHandleSend(t *testing.T) {
-	base, close := testrig.CreateBaseDendrite(t, test.DBTypeSQLite)
+	test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
+		base, close := testrig.CreateBaseDendrite(t, dbType)
 		defer close()
 
 		fedMux := mux.NewRouter().SkipClean(true).PathPrefix(httputil.PublicFederationPathPrefix).Subrouter().UseEncodedPath()
@@ -556,6 +557,9 @@ func TestHandleSend(t *testing.T) {
 				SigningIdentity: gomatrixserverlib.SigningIdentity{
 					ServerName: "remote",
 				},
+				Metrics: config.Metrics{
+					Enabled: false,
+				},
 			},
 		}
 		fedapi := fedAPI.NewInternalAPI(base, nil, nil, nil, nil, true)
@@ -590,4 +594,5 @@ func TestHandleSend(t *testing.T) {
 
 		res := w.Result()
 		assert.Equal(t, 200, res.StatusCode)
+	})
 }

relayapi/relayapi_test.go

@@ -104,7 +104,8 @@ func createSendRelayTxnHTTPRequest(serverName gomatrixserverlib.ServerName, txnI
 }
 
 func TestCreateRelayPublicRoutes(t *testing.T) {
-	base, close := testrig.CreateBaseDendrite(t, test.DBTypeSQLite)
+	test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
+		base, close := testrig.CreateBaseDendrite(t, dbType)
 		defer close()
 
 		relayAPI := relayapi.NewRelayInternalAPI(base, nil, nil, nil, nil)
@@ -149,4 +150,5 @@ func TestCreateRelayPublicRoutes(t *testing.T) {
 				t.Fatalf("%s: got HTTP %d want %d", tc.name, w.Code, tc.wantCode)
 			}
 		}
+	})
 }

test/db.go

@@ -19,10 +19,12 @@ import (
 	"database/sql"
 	"encoding/hex"
 	"fmt"
+	"math/rand"
 	"os"
 	"os/exec"
 	"os/user"
 	"testing"
+	"time"
 
 	"github.com/lib/pq"
 )
@@ -100,15 +102,16 @@ func currentUser() string {
 // Returns the connection string to use and a close function which must be called when the test finishes.
 // Calling this function twice will return the same database, which will have data from previous tests
 // unless close() is called.
-// TODO: namespace for concurrent package tests
 func PrepareDBConnectionString(t *testing.T, dbType DBType) (connStr string, close func()) {
 	if dbType == DBTypeSQLite {
-		// this will be made in the current working directory which namespaces concurrent package runs correctly
+		rand.Seed(time.Now().UnixNano())
-		dbname := "dendrite_test.db"
+		randBytes := make([]byte, 32)
-		return fmt.Sprintf("file:%s", dbname), func() {
+		rand.Read(randBytes)
-			err := os.Remove(dbname)
+		dbName := fmt.Sprintf("dendrite_test_%s.db", hex.EncodeToString(randBytes[:16]))
+		return fmt.Sprintf("file:%s", dbName), func() {
+			err := os.Remove(dbName)
 			if err != nil {
-				t.Fatalf("failed to cleanup sqlite db '%s': %s", dbname, err)
+				t.Fatalf("failed to cleanup sqlite db '%s': %s", dbName, err)
 			}
 		}
 	}
@@ -176,7 +179,7 @@ func WithAllDatabases(t *testing.T, testFn func(t *testing.T, db DBType)) {
 	for dbName, dbType := range dbs {
 		dbt := dbType
 		t.Run(dbName, func(tt *testing.T) {
-			//tt.Parallel()
+			tt.Parallel()
 			testFn(tt, dbt)
 		})
 	}

test/testrig/base.go

@@ -69,6 +69,22 @@ func CreateBaseDendrite(t *testing.T, dbType test.DBType) (*base.BaseDendrite, f
 			Monolithic: false, // because we need a database per component
 		})
 		cfg.Global.ServerName = "test"
+		connStr, _ := test.PrepareDBConnectionString(t, dbType)
+		cfg.FederationAPI.Database.ConnectionString = config.DataSource(connStr)
+		connStr, _ = test.PrepareDBConnectionString(t, dbType)
+		cfg.KeyServer.Database.ConnectionString = config.DataSource(connStr)
+		connStr, _ = test.PrepareDBConnectionString(t, dbType)
+		cfg.MSCs.Database.ConnectionString = config.DataSource(connStr)
+		connStr, _ = test.PrepareDBConnectionString(t, dbType)
+		cfg.MediaAPI.Database.ConnectionString = config.DataSource(connStr)
+		connStr, _ = test.PrepareDBConnectionString(t, dbType)
+		cfg.RoomServer.Database.ConnectionString = config.DataSource(connStr)
+		connStr, _ = test.PrepareDBConnectionString(t, dbType)
+		cfg.SyncAPI.Database.ConnectionString = config.DataSource(connStr)
+		connStr, _ = test.PrepareDBConnectionString(t, dbType)
+		cfg.UserAPI.AccountDatabase.ConnectionString = config.DataSource(connStr)
+		connStr, _ = test.PrepareDBConnectionString(t, dbType)
+		cfg.RelayAPI.Database.ConnectionString = config.DataSource(connStr)
 		// use a distinct prefix else concurrent postgres/sqlite runs will clash since NATS will use
 		// the file system event with InMemory=true :(
 		cfg.Global.JetStream.TopicPrefix = fmt.Sprintf("Test_%d_", dbType)
@@ -82,6 +98,7 @@ func CreateBaseDendrite(t *testing.T, dbType test.DBType) (*base.BaseDendrite, f
 				cfg.RoomServer.Database.ConnectionString,
 				cfg.SyncAPI.Database.ConnectionString,
 				cfg.UserAPI.AccountDatabase.ConnectionString,
+				cfg.RelayAPI.Database.ConnectionString,
 			}
 			for _, fileURI := range dbFiles {
 				path := strings.TrimPrefix(string(fileURI), "file:")