From 72154fd4745d140ea63d7edb99a52ae18d1ac92c Mon Sep 17 00:00:00 2001
From: Robert Swain <rob@matrix.org>
Date: Sat, 3 Jun 2017 12:19:27 +0200
Subject: [PATCH] syncserver-integration-tests: WIP db improvements
---
.../dendrite/cmd/syncserver-integration-tests/main.go | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/github.com/matrix-org/dendrite/cmd/syncserver-integration-tests/main.go b/src/github.com/matrix-org/dendrite/cmd/syncserver-integration-tests/main.go
index f8f6ff91a..9ad825651 100644
--- a/src/github.com/matrix-org/dendrite/cmd/syncserver-integration-tests/main.go
+++ b/src/github.com/matrix-org/dendrite/cmd/syncserver-integration-tests/main.go
@@ -50,6 +50,10 @@ var (
testDatabaseName = defaulting(os.Getenv("DATABASE_NAME"), "syncserver_test")
// 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))
+ // 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"
@@ -83,6 +87,7 @@ func getLastRequestError() error {
var syncServerConfigFileContents = (`consumer_uris: ["` + kafkaURI + `"]
roomserver_topic: "` + inputTopic + `"
database: "` + testDatabase + `"
+account_database: "` + testAccountDatabase + `"
server_name: "localhost"
`)
@@ -231,6 +236,9 @@ func startSyncServer() (*exec.Cmd, chan error) {
if err := createDatabase(testDatabaseName); err != nil {
panic(err)
}
+ if err := createDatabase(testAccountDatabaseName); err != nil {
+ panic(err)
+ }
if err := createTestUser(testDatabase, "alice", "@alice:localhost"); err != nil {
panic(err)