Merge lp:~jonas-drange/ubuntu-push/fix-tlsservername-failure-automatic into lp:ubuntu-push/automatic

[Jonas G. Drange]

stop cgo pointer checks at dh_auto_test time, and fix test after go 1.6 broke it (lp #1534417)

This is a copy paste of https://github.com/golang/go/blob/9f08b6c/src/net/http/client_test.go#L643 besides the disabling of cgo checks

[Ken VanDine (ken-vandine)]

Looks fine

review: Approve

=== modified file 'debian/rules'
--- debian/rules	2016-01-14 20:58:52 +0000
+++ debian/rules	2016-03-10 20:26:17 +0000
@@ -25,6 +25,9 @@
 	dh_auto_build --buildsystem=golang
 	(cd signing-helper && cmake . && make)
 
+override_dh_auto_test:
+	GODEBUG=cgocheck=0 dh_auto_test -O--buildsystem=golang
+
 override_dh_install:
 	dh_install -Xusr/bin/cmd --fail-missing
 
 
=== modified file 'http13client/client_test.go'
--- http13client/client_test.go	2014-06-20 12:59:40 +0000
+++ http13client/client_test.go	2016-03-10 20:26:17 +0000
@@ -601,14 +601,19 @@
 
 func TestClientWithCorrectTLSServerName(t *testing.T) {
 	defer afterTest(t)
+
+	const serverName = "example.com"
 	ts := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.TLS.ServerName != "127.0.0.1" {
-			t.Errorf("expected client to set ServerName 127.0.0.1, got: %q", r.TLS.ServerName)
+		if r.TLS.ServerName != serverName {
+			t.Errorf("expected client to set ServerName %q, got: %q", serverName, r.TLS.ServerName)
 		}
 	}))
 	defer ts.Close()
 
-	c := &Client{Transport: newTLSTransport(t, ts)}
+	trans := newTLSTransport(t, ts)
+	trans.TLSClientConfig.ServerName = serverName
+	c := &Client{Transport: trans}
+
 	if _, err := c.Get(ts.URL); err != nil {
 		t.Fatalf("expected successful TLS connection, got error: %v", err)
 	}