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

Fix failing test

Browse source
This commit is contained in:
Brendan Abolivier 2017-08-16 12:31:27 +01:00
parent 8613b7ee9e
commit f883b04e9e
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/github.com/matrix-org/dendrite/common/test/config.go
View file

@ -94,12 +94,14 @@ func MakeConfig(configDir, kafkaURI, database, host string, startPort int) (*con
cfg.Database.RoomServer = config.DataSource(database) cfg.Database.RoomServer = config.DataSource(database)
cfg.Database.ServerKey = config.DataSource(database) cfg.Database.ServerKey = config.DataSource(database)
cfg.Database.SyncAPI = config.DataSource(database) cfg.Database.SyncAPI = config.DataSource(database)
cfg.Database.PublicRoomsAPI = config.DataSource(database)
cfg.Listen.ClientAPI = assignAddress() cfg.Listen.ClientAPI = assignAddress()
cfg.Listen.FederationAPI = assignAddress() cfg.Listen.FederationAPI = assignAddress()
cfg.Listen.MediaAPI = assignAddress() cfg.Listen.MediaAPI = assignAddress()
cfg.Listen.RoomServer = assignAddress() cfg.Listen.RoomServer = assignAddress()
cfg.Listen.SyncAPI = assignAddress() cfg.Listen.SyncAPI = assignAddress()
cfg.Listen.PublicRoomsAPI = assignAddress()
return &cfg, port, nil return &cfg, port, nil
} }

1
src/github.com/matrix-org/dendrite/common/test/server.go
View file

@ -94,6 +94,7 @@ func StartProxy(bindAddr string, cfg *config.Dendrite) (*exec.Cmd, chan error) {
"--sync-api-server-url", "http://" + string(cfg.Listen.SyncAPI), "--sync-api-server-url", "http://" + string(cfg.Listen.SyncAPI),
"--client-api-server-url", "http://" + string(cfg.Listen.ClientAPI), "--client-api-server-url", "http://" + string(cfg.Listen.ClientAPI),
"--media-api-server-url", "http://" + string(cfg.Listen.MediaAPI), "--media-api-server-url", "http://" + string(cfg.Listen.MediaAPI),
"--public-rooms-api-server-url", "http://" + string(cfg.Listen.PublicRoomsAPI),
} }
return CreateBackgroundCommand( return CreateBackgroundCommand(
filepath.Join(filepath.Dir(os.Args[0]), "client-api-proxy"), filepath.Join(filepath.Dir(os.Args[0]), "client-api-proxy"),