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

Don't fail tests if we're unable to connect to a postgres server

Browse source
This commit is contained in:
Till Faelligen 2022-12-01 07:43:44 +01:00
parent 87d03616c2
commit 352d44823f
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
test/db.go
View file

@ -65,6 +65,10 @@ func createRemoteDB(t *testing.T, dbName, user, connStr string) {
fatalError(t, "failed to open postgres conn with connstr=%s : %s", connStr, err) fatalError(t, "failed to open postgres conn with connstr=%s : %s", connStr, err)
} }
if err = db.Ping(); err != nil { if err = db.Ping(); err != nil {
// If we're unable to reach the database, it's unlikely that a postgres server is
// available for testing. Set Required to false to skip the test instead of failing it.
Required = false
t.Logf("Note: tests require a postgres install accessible to the current user")
fatalError(t, "failed to open postgres conn with connstr=%s : %s", connStr, err) fatalError(t, "failed to open postgres conn with connstr=%s : %s", connStr, err)
} }
_, err = db.Exec(fmt.Sprintf(`CREATE DATABASE %s;`, dbName)) _, err = db.Exec(fmt.Sprintf(`CREATE DATABASE %s;`, dbName))
@ -169,9 +173,6 @@ func PrepareDBConnectionString(t *testing.T, dbType DBType) (connStr string, clo
// Creates subtests with each known DBType // Creates subtests with each known DBType
func WithAllDatabases(t *testing.T, testFn func(t *testing.T, db DBType)) { func WithAllDatabases(t *testing.T, testFn func(t *testing.T, db DBType)) {
if testing.Short() {
t.Skip("skipping test in short mode.")
}
dbs := map[string]DBType{ dbs := map[string]DBType{
"postgres": DBTypePostgres, "postgres": DBTypePostgres,
"sqlite": DBTypeSQLite, "sqlite": DBTypeSQLite,

3
test/testrig/base.go
View file

@ -30,9 +30,6 @@ import (
) )
func CreateBaseDendrite(t *testing.T, dbType test.DBType) (*base.BaseDendrite, func()) { func CreateBaseDendrite(t *testing.T, dbType test.DBType) (*base.BaseDendrite, func()) {
if testing.Short() {
t.Skip("skipping test in short mode.")
}
var cfg config.Dendrite var cfg config.Dendrite
cfg.Defaults(config.DefaultOpts{ cfg.Defaults(config.DefaultOpts{
Generate: false, Generate: false,