Use test.WithAllDatabases
MODIFY
appservice/appservice_test.go
appservice/appservice_test.go
@@ -108,7 +108,7 @@ func TestAppserviceInternalAPI(t *testing.T) {
}
test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
- base, closeBase := testrig.CreateBaseDendrite(t, test.DBTypeSQLite)
+ base, closeBase := testrig.CreateBaseDendrite(t, dbType)
defer closeBase()
// Create a dummy application service

MODIFY
userapi/userapi_test.go
userapi/userapi_test.go
@@ -27,14 +27,13 @@ import (
"golang.org/x/crypto/bcrypt"
"github.com/matrix-org/dendrite/internal/httputil"
+ "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/test"
"github.com/matrix-org/dendrite/test/testrig"
"github.com/matrix-org/dendrite/userapi"
- "github.com/matrix-org/dendrite/userapi/inthttp"
-
- "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/userapi/api"
"github.com/matrix-org/dendrite/userapi/internal"
+ "github.com/matrix-org/dendrite/userapi/inthttp"
"github.com/matrix-org/dendrite/userapi/storage"
)
@@ -79,19 +78,6 @@ func MustMakeInternalAPI(t *testing.T, opts apiTestOpts, dbType test.DBType) (ap
func TestQueryProfile(t *testing.T) {
aliceAvatarURL := "mxc://example.com/alice"
aliceDisplayName := "Alice"
- // only one DBType, since userapi.AddInternalRoutes complains about multiple prometheus counters added
- userAPI, accountDB, close := MustMakeInternalAPI(t, apiTestOpts{}, test.DBTypeSQLite)
- defer close()
- _, err := accountDB.CreateAccount(context.TODO(), "alice", serverName, "foobar", "", api.AccountTypeUser)
- if err != nil {
- t.Fatalf("failed to make account: %s", err)
- }
- if _, _, err := accountDB.SetAvatarURL(context.TODO(), "alice", serverName, aliceAvatarURL); err != nil {
- t.Fatalf("failed to set avatar url: %s", err)
- }
- if _, _, err := accountDB.SetDisplayName(context.TODO(), "alice", serverName, aliceDisplayName); err != nil {
- t.Fatalf("failed to set display name: %s", err)
- }
testCases := []struct {
req api.QueryProfileRequest
@@ -142,6 +128,20 @@ func TestQueryProfile(t *testing.T) {
}
}
+ test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
+ userAPI, accountDB, close := MustMakeInternalAPI(t, apiTestOpts{}, dbType)
+ defer close()
+ _, err := accountDB.CreateAccount(context.TODO(), "alice", serverName, "foobar", "", api.AccountTypeUser)
+ if err != nil {
+ t.Fatalf("failed to make account: %s", err)
+ }
+ if _, _, err := accountDB.SetAvatarURL(context.TODO(), "alice", serverName, aliceAvatarURL); err != nil {
+ t.Fatalf("failed to set avatar url: %s", err)
+ }
+ if _, _, err := accountDB.SetDisplayName(context.TODO(), "alice", serverName, aliceDisplayName); err != nil {
+ t.Fatalf("failed to set display name: %s", err)
+ }
+
t.Run("HTTP API", func(t *testing.T) {
router := mux.NewRouter().PathPrefix(httputil.InternalPathPrefix).Subrouter()
userapi.AddInternalRoutes(router, userAPI, false)
@@ -156,6 +156,7 @@ func TestQueryProfile(t *testing.T) {
t.Run("Monolith", func(t *testing.T) {
runCases(userAPI, false)
})
+ })
}
// TestPasswordlessLoginFails ensures that a passwordless account cannot

Use test.WithAllDatabases