Merge lp:ubuntu-push/automatic into lp:ubuntu-push

[Jonas G. Drange]

* deprecate the usage of Info in the systemimage module and replace it with Information
* disable runtime cgo pointer checks

[lp:ubuntu-push/automatic]

425. By Jonas G. Drange on 2016-03-10

[r=ken-vandine] stop cgo pointer checks at dh_auto_test time, and fix test after go 1.6 broke it (lp #1534417)

=== modified file 'Makefile'
--- Makefile	2015-11-20 14:21:38 +0000
+++ Makefile	2016-03-10 20:37:13 +0000
@@ -13,7 +13,8 @@
 GODEPS += code.google.com/p/gosqlite/sqlite3
 GODEPS += code.google.com/p/go-uuid/uuid
 
-GOTEST := ./scripts/goctest
+# cgocheck=0 is a workaround for lp:1555198
+GOTEST := GODEBUG=cgocheck=0 ./scripts/goctest
 
 TOTEST = $(shell env GOPATH=$(GOPATH) go list $(PROJECT)/...|grep -v acceptance|grep -v http13client )
 TOBUILD = $(shell grep -lr '^package main')

=== modified file 'bus/systemimage/systemimage.go'
--- bus/systemimage/systemimage.go	2015-01-21 17:21:42 +0000
+++ bus/systemimage/systemimage.go	2016-03-10 20:37:13 +0000
@@ -18,6 +18,9 @@
 package systemimage
 
 import (
+	"strconv"
+	"strings"
+
 	"launchpad.net/ubuntu-push/bus"
 	"launchpad.net/ubuntu-push/logger"
 )
@@ -37,11 +40,12 @@
 	// xxx channel_target missing
 	LastUpdate    string
 	VersionDetail map[string]string
+	Raw           map[string]string
 }
 
 // A SystemImage exposes the a subset of system-image service.
 type SystemImage interface {
-	Info() (*InfoResult, error)
+	Information() (*InfoResult, error)
 }
 
 type systemImage struct {
@@ -56,13 +60,44 @@
 
 var _ SystemImage = &systemImage{} // ensures it conforms
 
-func (si *systemImage) Info() (*InfoResult, error) {
-	si.log.Debugf("invoking Info")
-	res := &InfoResult{}
-	err := si.endp.Call("Info", bus.Args(), &res.BuildNumber, &res.Device, &res.Channel, &res.LastUpdate, &res.VersionDetail)
+func (si *systemImage) Information() (*InfoResult, error) {
+	si.log.Debugf("invoking Information")
+	m := map[string]string{}
+	err := si.endp.Call("Information", bus.Args(), &m)
+
 	if err != nil {
-		si.log.Errorf("Info failed: %v", err)
+		si.log.Errorf("Information failed: %v", err)
 		return nil, err
 	}
+
+	res := &InfoResult{}
+
+	// Try parsing the build number if it exist.
+	if bn := m["current_build_number"]; len(bn) > 0 {
+		bn, err := strconv.ParseInt(bn, 10, 32)
+		if err == nil {
+			res.BuildNumber = int32(bn)
+		} else {
+			res.BuildNumber = -1
+		}
+	}
+
+	res.Device = m["device_name"]
+	res.Channel = m["channel_name"]
+	res.LastUpdate = m["last_update_date"]
+	res.VersionDetail = map[string]string{}
+
+	// Split version detail key=value,key2=value2 into a string map
+	// Note that even if
+	vals := strings.Split(m["version_detail"], ",")
+	for _, val := range vals {
+		pairs := strings.Split(val, "=")
+		if len(pairs) != 2 {
+			continue
+		}
+		res.VersionDetail[pairs[0]] = pairs[1]
+	}
+	res.Raw = m
+
 	return res, err
 }

=== modified file 'bus/systemimage/systemimage_test.go'
--- bus/systemimage/systemimage_test.go	2014-04-02 08:46:48 +0000
+++ bus/systemimage/systemimage_test.go	2016-03-10 20:37:13 +0000
@@ -41,22 +41,38 @@
 }
 
 func (s *SISuite) TestWorks(c *C) {
-	endp := testibus.NewMultiValuedTestingEndpoint(nil, condition.Work(true), []interface{}{int32(101), "mako", "daily", "Unknown", map[string]string{}})
+	m := map[string]string{
+		"version_detail":        "ubuntu=20160304.2,device=20160304.2,custom=20160304.2,version=381",
+		"last_update_date":      "2016-03-04 15:25:31",
+		"last_check_date":       "2016-03-08 04:30:34",
+		"target_version_detail": "-1",
+		"device_name":           "mako",
+		"target_build_number":   "-1",
+		"channel_name":          "ubuntu-touch/rc-proposed/ubuntu",
+		"current_build_number":  "381",
+	}
+	endp := testibus.NewMultiValuedTestingEndpoint(nil, condition.Work(true), []interface{}{m})
 	si := New(endp, s.log)
-	res, err := si.Info()
+	res, err := si.Information()
 	c.Assert(err, IsNil)
 	c.Check(res, DeepEquals, &InfoResult{
-		BuildNumber:   101,
-		Device:        "mako",
-		Channel:       "daily",
-		LastUpdate:    "Unknown",
-		VersionDetail: map[string]string{},
+		BuildNumber: 381,
+		Device:      "mako",
+		Channel:     "ubuntu-touch/rc-proposed/ubuntu",
+		LastUpdate:  "2016-03-04 15:25:31",
+		VersionDetail: map[string]string{
+			"ubuntu":  "20160304.2",
+			"device":  "20160304.2",
+			"custom":  "20160304.2",
+			"version": "381",
+		},
+		Raw: m,
 	})
 }
 
 func (s *SISuite) TestFailsIfCallFails(c *C) {
 	endp := testibus.NewTestingEndpoint(nil, condition.Work(false))
 	si := New(endp, s.log)
-	_, err := si.Info()
+	_, err := si.Information()
 	c.Check(err, NotNil)
 }

=== modified file 'client/client.go'
--- client/client.go	2015-09-30 14:44:14 +0000
+++ client/client.go	2016-03-10 20:37:13 +0000
@@ -292,7 +292,7 @@
 	go cs.Track(client.connCh)
 	util.NewAutoRedialer(client.systemImageEndp).Redial()
 	sysimg := systemimage.New(client.systemImageEndp, client.log)
-	info, err := sysimg.Info()
+	info, err := sysimg.Information()
 	if err != nil {
 		return err
 	}

=== modified file 'client/client_test.go'
--- client/client_test.go	2015-10-01 20:16:49 +0000
+++ client/client_test.go	2016-03-10 20:37:13 +0000
@@ -674,7 +674,16 @@
 		dbus.ObjectPath("hello"),
 	)
 	siCond := condition.Fail2Work(2)
-	siEndp := testibus.NewMultiValuedTestingEndpoint(siCond, condition.Work(true), []interface{}{int32(101), "mako", "daily", "Unknown", map[string]string{}})
+	siEndp := testibus.NewMultiValuedTestingEndpoint(siCond, condition.Work(true), []interface{}{map[string]string{
+		"version_detail":        "ubuntu=20160304.2,device=20160304.2,custom=20160304.2,version=381",
+		"last_update_date":      "2016-03-04 15:25:31",
+		"last_check_date":       "2016-03-08 04:30:34",
+		"target_version_detail": "-1",
+		"device_name":           "mako",
+		"target_build_number":   "-1",
+		"channel_name":          "ubuntu-touch/rc-proposed/ubuntu",
+		"current_build_number":  "381",
+	}})
 	tickerCh := make(chan []interface{})
 	nopTickerCh := make(chan []interface{})
 	testibus.SetWatchSource(cEndp, "StateChanged", tickerCh)

=== modified file 'debian/rules'
--- debian/rules	2016-01-14 20:58:52 +0000
+++ debian/rules	2016-03-10 20:37:13 +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:37:13 +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)
 	}