mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 18:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove BaseDendrite from tests

Browse source
This commit is contained in:
Till Faelligen 2023-03-20 17:51:58 +01:00
parent edb5b4b637
commit 4c77ff3b26
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
2 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
userapi/storage/storage_test.go
View file

@ -576,8 +576,9 @@ func Test_Notification(t *testing.T) {
} }
func mustCreateKeyDatabase(t *testing.T, dbType test.DBType) (storage.KeyDatabase, func()) { func mustCreateKeyDatabase(t *testing.T, dbType test.DBType) (storage.KeyDatabase, func()) {
base, close := testrig.CreateBaseDendrite(t, dbType) cfg, _, close := testrig.CreateConfig(t, dbType)
db, err := storage.NewKeyDatabase(base.ConnectionManager, &base.Cfg.KeyServer.Database) cm := sqlutil.NewConnectionManager(cfg.Global.DatabaseOptions)
db, err := storage.NewKeyDatabase(cm, &cfg.KeyServer.Database)
if err != nil { if err != nil {
t.Fatalf("failed to create new database: %v", err) t.Fatalf("failed to create new database: %v", err)
} }

26
userapi/userapi_test.go
View file

@ -68,34 +68,25 @@ func MustMakeInternalAPI(t *testing.T, opts apiTestOpts, dbType test.DBType, pub
if opts.loginTokenLifetime == 0 { if opts.loginTokenLifetime == 0 {
opts.loginTokenLifetime = api.DefaultLoginTokenLifetime * time.Millisecond opts.loginTokenLifetime = api.DefaultLoginTokenLifetime * time.Millisecond
} }
base, baseclose := testrig.CreateBaseDendrite(t, dbType) cfg, ctx, close := testrig.CreateConfig(t, dbType)
connStr, close := test.PrepareDBConnectionString(t, dbType)
sName := serverName sName := serverName
if opts.serverName != "" { if opts.serverName != "" {
sName = gomatrixserverlib.ServerName(opts.serverName) sName = gomatrixserverlib.ServerName(opts.serverName)
} }
cm := sqlutil.NewConnectionManager(config.DatabaseOptions{}) cm := sqlutil.NewConnectionManager(cfg.Global.DatabaseOptions)
ctx := context.Background()
accountDB, err := storage.NewUserDatabase(ctx, cm, &config.DatabaseOptions{ accountDB, err := storage.NewUserDatabase(ctx.Context(), cm, &cfg.UserAPI.AccountDatabase, sName, bcrypt.MinCost, config.DefaultOpenIDTokenLifetimeMS, opts.loginTokenLifetime, "")
ConnectionString: config.DataSource(connStr),
}, sName, bcrypt.MinCost, config.DefaultOpenIDTokenLifetimeMS, opts.loginTokenLifetime, "")
if err != nil { if err != nil {
t.Fatalf("failed to create account DB: %s", err) t.Fatalf("failed to create account DB: %s", err)
} }
keyDB, err := storage.NewKeyDatabase(base.ConnectionManager, &config.DatabaseOptions{ keyDB, err := storage.NewKeyDatabase(cm, &cfg.KeyServer.Database)
ConnectionString: config.DataSource(connStr),
})
if err != nil { if err != nil {
t.Fatalf("failed to create key DB: %s", err) t.Fatalf("failed to create key DB: %s", err)
} }
cfg := &config.UserAPI{ cfg.Global.SigningIdentity = gomatrixserverlib.SigningIdentity{
Matrix: &config.Global{ ServerName: sName,
SigningIdentity: gomatrixserverlib.SigningIdentity{
ServerName: sName,
},
},
} }
if publisher == nil { if publisher == nil {
@ -107,12 +98,11 @@ func MustMakeInternalAPI(t *testing.T, opts apiTestOpts, dbType test.DBType, pub
return &internal.UserInternalAPI{ return &internal.UserInternalAPI{
DB: accountDB, DB: accountDB,
KeyDatabase: keyDB, KeyDatabase: keyDB,
Config: cfg, Config: &cfg.UserAPI,
SyncProducer: syncProducer, SyncProducer: syncProducer,
KeyChangeProducer: keyChangeProducer, KeyChangeProducer: keyChangeProducer,
}, accountDB, func() { }, accountDB, func() {
close() close()
baseclose()
} }
} }