mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-16 03:13:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use travis' postgres for testing

Browse source 
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
This commit is contained in:
Maximilian Seifert 2019-03-27 22:37:24 +01:00
parent 8b8b55d0a6
commit 7edf1a038a
2 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
clientapi/auth/storage/devices/storage_test.go
View file

@ -6,6 +6,7 @@ import (
"github.com/matrix-org/dendrite/clientapi/auth/authtypes" "github.com/matrix-org/dendrite/clientapi/auth/authtypes"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"os" "os"
"os/exec"
"strings" "strings"
"testing" "testing"
) )
@ -13,6 +14,7 @@ import (
var dataSource string var dataSource string
var insideCi = false var insideCi = false
var insideDocker = false var insideDocker = false
const dbName = "dendrite_device"
func init() { func init() {
for _, val := range os.Environ() { for _, val := range os.Environ() {
@ -28,14 +30,30 @@ func init() {
} }
if insideCi { if insideCi {
dataSource = "postgres://postgres@localhost/dendrite_device?sslmode=disable" dataSource = fmt.Sprintf("postgres://postgres@localhost/%s?sslmode=disable", dbName)
} else if insideDocker { } else if insideDocker {
dataSource = "postgres://dendrite:itsasecret@postgres/dendrite_device?sslmode=disable" dataSource = fmt.Sprintf("postgres://dendrite:itsasecret@localhost/%s?sslmode=disable", dbName)
} else { } else {
dataSource = "postgres://dendrite:itsasecret@localhost:15432/dendrite_device?sslmode=disable" dataSource = fmt.Sprintf("postgres://dendrite:itsasecret@localhost:15432/%s?sslmode=disable", dbName)
}
if insideCi {
database := "dendrite_device"
cmd := exec.Command("psql", database)
cmd.Stdin = strings.NewReader(
fmt.Sprintf("DROP DATABASE IF EXISTS %s; CREATE DATABASE %s;", database, database),
)
// Send stdout and stderr to our stderr so that we see error messages from
// the psql process
cmd.Stdout = os.Stderr
cmd.Stderr = os.Stderr
_ = cmd.Run()
} }
} }
type deviceSpec struct { type deviceSpec struct {
localPart string localPart string
devID string devID string

22
syncapi/storage/output_room_events_table_test.go
View file

@ -2,10 +2,12 @@ package storage
import ( import (
"context" "context"
"fmt"
"github.com/matrix-org/dendrite/roomserver/api" "github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"os" "os"
"os/exec"
"strings" "strings"
"testing" "testing"
"time" "time"
@ -14,6 +16,7 @@ import (
var dataSource string var dataSource string
var insideCi = false var insideCi = false
var insideDocker = false var insideDocker = false
const dbName = "dendrite_syncapi"
func init() { func init() {
for _, val := range os.Environ() { for _, val := range os.Environ() {
@ -29,11 +32,24 @@ func init() {
} }
if insideCi { if insideCi {
dataSource = "postgres://postgres@localhost/dendrite_syncapi?sslmode=disable" dataSource = fmt.Sprintf("postgres://postgres@localhost/%s?sslmode=disable", dbName)
} else if insideDocker { } else if insideDocker {
dataSource = "postgres://dendrite:itsasecret@postgres/dendrite_syncapi?sslmode=disable" dataSource = fmt.Sprintf("postgres://dendrite:itsasecret@localhost/%s?sslmode=disable", dbName)
} else { } else {
dataSource = "postgres://dendrite:itsasecret@localhost:15432/dendrite_syncapi?sslmode=disable" dataSource = fmt.Sprintf("postgres://dendrite:itsasecret@localhost:15432/%s?sslmode=disable", dbName)
}
if insideCi {
database := "dendrite_syncapi"
cmd := exec.Command("psql", database)
cmd.Stdin = strings.NewReader(
fmt.Sprintf("DROP DATABASE IF EXISTS %s; CREATE DATABASE %s;", database, database),
)
// Send stdout and stderr to our stderr so that we see error messages from
// the psql process
cmd.Stdout = os.Stderr
cmd.Stderr = os.Stderr
_ = cmd.Run()
} }
} }