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

cmd/mediaapi-integration-tests: Make startMediaAPI return listen address

Browse source
This commit is contained in:
Robert Swain 2017-06-07 17:18:46 +02:00
parent 83e54d9d74
commit 935f3275b9
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +65,7 @@ var testDatabaseTemplate = "dbname=%s sslmode=disable binary_parameters=yes"
var timeout time.Duration var timeout time.Duration
func startMediaAPI(suffix string, dynamicThumbnails bool) (*exec.Cmd, chan error, string) { func startMediaAPI(suffix string, dynamicThumbnails bool) (*exec.Cmd, chan error, string, string) {
dir, err := ioutil.TempDir("", serverType+"-server-test"+suffix) dir, err := ioutil.TempDir("", serverType+"-server-test"+suffix)
if err != nil { if err != nil {
panic(err) panic(err)
@ -74,9 +74,10 @@ func startMediaAPI(suffix string, dynamicThumbnails bool) (*exec.Cmd, chan error
configFilename := serverType + "-server-test-config" + suffix + ".yaml" configFilename := serverType + "-server-test-config" + suffix + ".yaml"
configFileContents := makeConfig(suffix, dir, dynamicThumbnails) configFileContents := makeConfig(suffix, dir, dynamicThumbnails)
serverAddr := "localhost:1777" + suffix
serverArgs := []string{ serverArgs := []string{
"--config", configFilename, "--config", configFilename,
"--listen", "localhost:1777" + suffix, "--listen", serverAddr,
} }
databases := []string{ databases := []string{
@ -93,7 +94,7 @@ func startMediaAPI(suffix string, dynamicThumbnails bool) (*exec.Cmd, chan error
postgresContainerName, postgresContainerName,
databases, databases,
) )
return cmd, cmdChan, dir return cmd, cmdChan, serverAddr, dir
} }
func makeConfig(suffix, basePath string, dynamicThumbnails bool) string { func makeConfig(suffix, basePath string, dynamicThumbnails bool) string {
@ -134,14 +135,14 @@ func main() {
} }
// create server1 with only pre-generated thumbnails allowed // create server1 with only pre-generated thumbnails allowed
server1Cmd, server1CmdChan, server1Dir := startMediaAPI("1", false) server1Cmd, server1CmdChan, server1Addr, server1Dir := startMediaAPI("1", false)
defer cleanUpServer(server1Cmd, server1Dir) defer cleanUpServer(server1Cmd, server1Dir)
testDownload("localhost:17771", "localhost:17771", "doesnotexist", "", 404, server1CmdChan) testDownload(server1Addr, server1Addr, "doesnotexist", "", 404, server1CmdChan)
// create server2 with dynamic thumbnail generation // create server2 with dynamic thumbnail generation
server2Cmd, server2CmdChan, server2Dir := startMediaAPI("2", true) server2Cmd, server2CmdChan, server2Addr, server2Dir := startMediaAPI("2", true)
defer cleanUpServer(server2Cmd, server2Dir) defer cleanUpServer(server2Cmd, server2Dir)
testDownload("localhost:17772", "localhost:17772", "doesnotexist", "", 404, server2CmdChan) testDownload(server2Addr, server2Addr, "doesnotexist", "", 404, server2CmdChan)
} }
func getMediaURI(scheme, host, endpoint string, components []string) string { func getMediaURI(scheme, host, endpoint string, components []string) string {