Merge lp:~verterok/ubuntu-push/extra-options-for-kit-api-client into lp:ubuntu-push/automatic

[Guillermo Gonzalez]

Add DisableKeepAlives and MaxIdleConnsPerHost to the APIClient SetupClient method.

add DisableKeepAlives and MaxIdleConnsPerHost to the APIClient SetupClient method.

[Bret Barker (noise)]

LGTM

review: Approve

=== modified file 'server/acceptance/kit/api.go'
--- server/acceptance/kit/api.go	2015-01-23 16:11:08 +0000
+++ server/acceptance/kit/api.go	2015-01-28 21:43:44 +0000
@@ -45,9 +45,11 @@
 }
 
 // SetupClient sets up the http client to make requests.
-func (api *APIClient) SetupClient(tlsConfig *tls.Config) {
+func (api *APIClient) SetupClient(tlsConfig *tls.Config, disableKeepAlives bool, maxIdleConnsPerHost int) {
 	api.httpClient = &http.Client{
-		Transport: &http.Transport{TLSClientConfig: tlsConfig},
+		Transport: &http.Transport{TLSClientConfig: tlsConfig,
+			DisableKeepAlives:   disableKeepAlives,
+			MaxIdleConnsPerHost: maxIdleConnsPerHost},
 	}
 }
 

=== modified file 'server/acceptance/suites/suite.go'
--- server/acceptance/suites/suite.go	2014-12-08 16:31:25 +0000
+++ server/acceptance/suites/suite.go	2015-01-28 21:43:44 +0000
@@ -21,6 +21,7 @@
 	"flag"
 	"fmt"
 	"net"
+	"net/http"
 	"os"
 	"regexp"
 	"runtime"
@@ -108,7 +109,7 @@
 	c.Assert(s.ServerHandle.ServerEvents, NotNil)
 	c.Assert(s.ServerHandle.ServerAddr, Not(Equals), "")
 	c.Assert(s.ServerAPIURL, Not(Equals), "")
-	s.SetupClient(nil)
+	s.SetupClient(nil, false, http.DefaultMaxIdleConnsPerHost)
 }
 
 func (s *AcceptanceSuite) TearDownTest(c *C) {