Merge lp:~jonas-drange/ubuntu-push/lp1554547 into lp:ubuntu-push/automatic

[Jonas G. Drange]

deprecate the usage of Info and replace it with Information

[dobey (dobey)]

Looks ok.

[Ubuntu One Auto Pilot (otto-pilot)]

There was a problem validating some authors of the branch. Authors must be either one of the listed Launchpad users, or a member of one of the listed teams on Launchpad.

Persons or Teams:

    contributor-agreement-canonical
    ubuntu-push-hackers

Unaccepted Authors:

    CI Train Bot <email address hidden>
    Rodney Dawes <email address hidden>

[Jonas G. Drange (jonas-drange)]

Mirror of dobey's ack.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

There was a problem validating some authors of the branch. Authors must be either one of the listed Launchpad users, or a member of one of the listed teams on Launchpad.

Persons or Teams:

    contributor-agreement-canonical
    ubuntu-push-hackers

Unaccepted Authors:

    CI Train Bot <email address hidden>
    Rodney Dawes <email address hidden>

[Ubuntu One Auto Pilot (otto-pilot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Unmerged revisions

160. By Jonas G. Drange on 2016-03-09

fix test failure in client caused by Info -> Information

159. By Jonas G. Drange on 2016-03-08

deprecate the Info usage

=== modified file 'bus/systemimage/systemimage.go'
--- bus/systemimage/systemimage.go	2015-01-21 17:21:42 +0000
+++ bus/systemimage/systemimage.go	2016-03-09 15:34:29 +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,37 @@
 
 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{}
+
+	bn, err := strconv.ParseInt(m["current_build_number"], 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
+	vals := strings.Split(m["version_detail"], ",")
+	for _, val := range vals {
+		pairs := strings.Split(val, "=")
+		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-09 15:34:29 +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-09 15:34:29 +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-09 15:34:29 +0000
@@ -674,7 +674,7 @@
 		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{}})
 	tickerCh := make(chan []interface{})
 	nopTickerCh := make(chan []interface{})
 	testibus.SetWatchSource(cEndp, "StateChanged", tickerCh)
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-11-20 18:02:47 +0000
+++ debian/changelog	2016-03-09 15:34:29 +0000
@@ -1,3 +1,80 @@
+ubuntu-push (0.68+16.04.20160114-0ubuntu1) xenial; urgency=medium
+
+  * Handle gccgo on s390x. (LP: #1517189, #1469398)
+
+ -- Rodney Dawes <[e-mail]>  Thu, 14 Jan 2016 21:13:22 +0000
+
+ubuntu-push (0.68+16.04.20151210-0ubuntu1) xenial; urgency=medium
+
+  [ jonas-drange ]
+  * use Notifications dbus API to play sounds (LP: #1517189, #1469398)
+
+ -- Jonas G. Drange <[e-mail]>  Thu, 10 Dec 2015 10:16:28 +0000
+
+ubuntu-push (0.68+16.04.20151203-0ubuntu1) xenial; urgency=medium
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ jonas-drange ]
+  * present a notification even though the screen is locked (LP:
+    #1517189, #1469398)
+
+ -- Jonas G. Drange <[e-mail]>  Thu, 03 Dec 2015 14:56:24 +0000
+
+ubuntu-push (0.68+16.04.20151130-0ubuntu1) xenial; urgency=medium
+
+  [ CI Train Bot ]
+  * Add support for signing methods other than POST via argv[2]. Test
+    fixes for Go 1.5. Avoid losing notifications when screen is locked.
+    Fix lp:1469398 by using the connectivity state. Fix case where a
+    failed powerd wakeup request would deadlock step(). Assert whether
+    or not there's a connection using the same method as local
+    connectivity package. (LP: #1517189, #1469398)
+  * New rebuild forced.
+
+  [ John R. Lenton ]
+  * Add support for signing methods other than POST via argv[2]. Test
+    fixes for Go 1.5. Avoid losing notifications when screen is locked.
+    Fix lp:1469398 by using the connectivity state. Fix case where a
+    failed powerd wakeup request would deadlock step(). Assert whether
+    or not there's a connection using the same method as local
+    connectivity package. (LP: #1517189, #1469398)
+
+  [ Michael Hudson-Doyle ]
+  * Add support for signing methods other than POST via argv[2]. Test
+    fixes for Go 1.5. Avoid losing notifications when screen is locked.
+    Fix lp:1469398 by using the connectivity state. Fix case where a
+    failed powerd wakeup request would deadlock step(). Assert whether
+    or not there's a connection using the same method as local
+    connectivity package. (LP: #1517189, #1469398)
+
+  [ Rodney Dawes ]
+  * Add support for signing methods other than POST via argv[2]. Test
+    fixes for Go 1.5. Avoid losing notifications when screen is locked.
+    Fix lp:1469398 by using the connectivity state. Fix case where a
+    failed powerd wakeup request would deadlock step(). Assert whether
+    or not there's a connection using the same method as local
+    connectivity package. (LP: #1517189, #1469398)
+
+  [ Samuele Pedroni (Canonical Services Ltd.) ]
+  * Add support for signing methods other than POST via argv[2]. Test
+    fixes for Go 1.5. Avoid losing notifications when screen is locked.
+    Fix lp:1469398 by using the connectivity state. Fix case where a
+    failed powerd wakeup request would deadlock step(). Assert whether
+    or not there's a connection using the same method as local
+    connectivity package. (LP: #1517189, #1469398)
+
+  [ jonas-drange ]
+  * Add support for signing methods other than POST via argv[2]. Test
+    fixes for Go 1.5. Avoid losing notifications when screen is locked.
+    Fix lp:1469398 by using the connectivity state. Fix case where a
+    failed powerd wakeup request would deadlock step(). Assert whether
+    or not there's a connection using the same method as local
+    connectivity package. (LP: #1517189, #1469398)
+
+ -- Timo Jyrinki <[e-mail]>  Mon, 30 Nov 2015 21:16:20 +0000
+
 ubuntu-push (0.68+15.10.20150814.1-0ubuntu1) wily; urgency=medium
 
   [ CI Train Bot ]