Merge lp:~pedronis/ubuntu-push/accept-auxcfg into lp:ubuntu-push

[Samuele Pedroni]

[trivial ]support supplying auxiliary configs to the server in acceptance tests

support supplying auxiliary configs to the server in acceptance tests

[lp:~pedronis/ubuntu-push/accept-auxcfg]

30. By Samuele Pedroni on 2014-01-30

support supplying auxiliary configs to the server in acceptance tests

[Samuele Pedroni (pedronis)]

review: Approve

=== modified file 'server/acceptance/acceptance_test.go'
--- server/acceptance/acceptance_test.go	2014-01-21 21:36:07 +0000
+++ server/acceptance/acceptance_test.go	2014-01-30 08:55:34 +0000
@@ -52,6 +52,7 @@
 var _ = Suite(&acceptanceSuite{})
 
 var serverCmd = flag.String("server", "", "server to test")
+var serverAuxCfg = flag.String("auxcfg", "", "auxiliary config for the server")
 
 func testServerConfig(addr, httpAddr string) map[string]interface{} {
 	cfg := map[string]interface{}{
@@ -113,7 +114,8 @@
 	if err != nil {
 		c.Fatal(err)
 	}
-	server := exec.Command(*serverCmd, cfgFilename)
+	cfgs := append(strings.Fields(*serverAuxCfg), cfgFilename)
+	server := exec.Command(*serverCmd, cfgs...)
 	stderr, err := server.StderrPipe()
 	if err != nil {
 		c.Fatal(err)