1f349/dendrite
4
0
Fork 0
mirror of https://github.com/1f349/dendrite.git synced 2024-11-09 22:42:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Really SKIP_NODB (#2472)

Browse Source 
* Really SKIP_NODB

* Use fatalError in createLocalDB

* Check if createdb exists

* Revert change

* Remove !Quiet
This commit is contained in:
Till 2022-05-18 15:17:23 +02:00 committed by GitHub
parent b3162755a9
commit f321a7d55e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/db.go
View File

@ -44,8 +44,9 @@ func fatalError(t *testing.T, format string, args ...interface{}) {
} }
func createLocalDB(t *testing.T, dbName string) { func createLocalDB(t *testing.T, dbName string) {
if !Quiet { if _, err := exec.LookPath("createdb"); err != nil {
t.Log("Note: tests require a postgres install accessible to the current user") fatalError(t, "Note: tests require a postgres install accessible to the current user")
return
} }
createDB := exec.Command("createdb", dbName) createDB := exec.Command("createdb", dbName)
if !Quiet { if !Quiet {
@ -63,6 +64,9 @@ func createRemoteDB(t *testing.T, dbName, user, connStr string) {
if err != nil { if err != nil {
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 {
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))
if err != nil { if err != nil {
pqErr, ok := err.(*pq.Error) pqErr, ok := err.(*pq.Error)