mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-04-03 07:24:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

syncserver-integration-tests: WIP db improvements

Browse source
This commit is contained in:
Robert Swain 2017-06-03 12:19:27 +02:00
parent aa17cf83ac
commit 72154fd474
1 changed files with 8 additions and 0 deletions

8
src/github.com/matrix-org/dendrite/cmd/syncserver-integration-tests/main.go
View file

@ -50,6 +50,10 @@ var (
testDatabaseName = defaulting(os.Getenv("DATABASE_NAME"), "syncserver_test") testDatabaseName = defaulting(os.Getenv("DATABASE_NAME"), "syncserver_test")
// The postgres connection config for connecting to the test database. // The postgres connection config for connecting to the test database.
testDatabase = defaulting(os.Getenv("DATABASE"), fmt.Sprintf("dbname=%s sslmode=disable binary_parameters=yes", testDatabaseName)) testDatabase = defaulting(os.Getenv("DATABASE"), fmt.Sprintf("dbname=%s sslmode=disable binary_parameters=yes", testDatabaseName))
// The name of the test account database to create.
testAccountDatabaseName = defaulting(os.Getenv("ACCOUNT_DATABASE_NAME"), "account_test")
// The postgres connection config for connecting to the test account database.
testAccountDatabase = defaulting(os.Getenv("ACCOUNT_DATABASE"), fmt.Sprintf("dbname=%s sslmode=disable binary_parameters=yes", testDatabaseName))
) )
const inputTopic = "syncserverInput" const inputTopic = "syncserverInput"
@ -83,6 +87,7 @@ func getLastRequestError() error {
var syncServerConfigFileContents = (`consumer_uris: ["` + kafkaURI + `"] var syncServerConfigFileContents = (`consumer_uris: ["` + kafkaURI + `"]
roomserver_topic: "` + inputTopic + `" roomserver_topic: "` + inputTopic + `"
database: "` + testDatabase + `" database: "` + testDatabase + `"
account_database: "` + testAccountDatabase + `"
server_name: "localhost" server_name: "localhost"
`) `)
@ -231,6 +236,9 @@ func startSyncServer() (*exec.Cmd, chan error) {
if err := createDatabase(testDatabaseName); err != nil { if err := createDatabase(testDatabaseName); err != nil {
panic(err) panic(err)
} }
if err := createDatabase(testAccountDatabaseName); err != nil {
panic(err)
}
if err := createTestUser(testDatabase, "alice", "@alice:localhost"); err != nil { if err := createTestUser(testDatabase, "alice", "@alice:localhost"); err != nil {
panic(err) panic(err)