1
=== modified file 'bus/systemimage/systemimage.go'
2
--- bus/systemimage/systemimage.go	2015-01-21 17:21:42 +0000
3
+++ bus/systemimage/systemimage.go	2016-03-10 13:15:52 +0000
4
@@ -18,6 +18,9 @@
5
18
package systemimage
18
package systemimage
6
19
19
7
20
import (
20
import (
8
21
	"strconv"
9
22
	"strings"
10
23
11
21
	"launchpad.net/ubuntu-push/bus"
24
	"launchpad.net/ubuntu-push/bus"
12
22
	"launchpad.net/ubuntu-push/logger"
25
	"launchpad.net/ubuntu-push/logger"
13
23
)
26
)
14
@@ -37,11 +40,12 @@
15
37
	// xxx channel_target missing
40
	// xxx channel_target missing
16
38
	LastUpdate    string
41
	LastUpdate    string
17
39
	VersionDetail map[string]string
42
	VersionDetail map[string]string
18
43
	Raw           map[string]string
19
40
}
44
}
20
41
45
21
42
// A SystemImage exposes the a subset of system-image service.
46
// A SystemImage exposes the a subset of system-image service.
22
43
type SystemImage interface {
47
type SystemImage interface {
24
44
	Info() (*InfoResult, error)
48
	Information() (*InfoResult, error)
25
45
}
49
}
26
46
50
27
47
type systemImage struct {
51
type systemImage struct {
28
@@ -56,13 +60,44 @@
29
56
60
30
57
var _ SystemImage = &systemImage{} // ensures it conforms
61
var _ SystemImage = &systemImage{} // ensures it conforms
31
58
62
36
59
func (si *systemImage) Info() (*InfoResult, error) {
63
func (si *systemImage) Information() (*InfoResult, error) {
37
60
	si.log.Debugf("invoking Info")
64
	si.log.Debugf("invoking Information")
38
61
	res := &InfoResult{}
65
	m := map[string]string{}
39
62
	err := si.endp.Call("Info", bus.Args(), &res.BuildNumber, &res.Device, &res.Channel, &res.LastUpdate, &res.VersionDetail)
66
	err := si.endp.Call("Information", bus.Args(), &m)
40
67
41
63
	if err != nil {
68
	if err != nil {
43
64
		si.log.Errorf("Info failed: %v", err)
69
		si.log.Errorf("Information failed: %v", err)
44
65
		return nil, err
70
		return nil, err
45
66
	}
71
	}
46
72
47
73
	res := &InfoResult{}
48
74
49
75
	// Try parsing the build number if it exist.
50
76
	if bn := m["current_build_number"]; len(bn) > 0 {
51
77
		bn, err := strconv.ParseInt(bn, 10, 32)
52
78
		if err == nil {
53
79
			res.BuildNumber = int32(bn)
54
80
		} else {
55
81
			res.BuildNumber = -1
56
82
		}
57
83
	}
58
84
59
85
	res.Device = m["device_name"]
60
86
	res.Channel = m["channel_name"]
61
87
	res.LastUpdate = m["last_update_date"]
62
88
	res.VersionDetail = map[string]string{}
63
89
64
90
	// Split version detail key=value,key2=value2 into a string map
65
91
	// Note that even if
66
92
	vals := strings.Split(m["version_detail"], ",")
67
93
	for _, val := range vals {
68
94
		pairs := strings.Split(val, "=")
69
95
		if len(pairs) != 2 {
70
96
			continue
71
97
		}
72
98
		res.VersionDetail[pairs[0]] = pairs[1]
73
99
	}
74
100
	res.Raw = m
75
101
76
67
	return res, err
102
	return res, err
77
68
}
103
}
78
69
104
79
=== modified file 'bus/systemimage/systemimage_test.go'
80
--- bus/systemimage/systemimage_test.go	2014-04-02 08:46:48 +0000
81
+++ bus/systemimage/systemimage_test.go	2016-03-10 13:15:52 +0000
82
@@ -41,22 +41,38 @@
83
41
}
41
}
84
42
42
85
43
func (s *SISuite) TestWorks(c *C) {
43
func (s *SISuite) TestWorks(c *C) {
87
44
	endp := testibus.NewMultiValuedTestingEndpoint(nil, condition.Work(true), []interface{}{int32(101), "mako", "daily", "Unknown", map[string]string{}})
44
	m := map[string]string{
88
45
		"version_detail":        "ubuntu=20160304.2,device=20160304.2,custom=20160304.2,version=381",
89
46
		"last_update_date":      "2016-03-04 15:25:31",
90
47
		"last_check_date":       "2016-03-08 04:30:34",
91
48
		"target_version_detail": "-1",
92
49
		"device_name":           "mako",
93
50
		"target_build_number":   "-1",
94
51
		"channel_name":          "ubuntu-touch/rc-proposed/ubuntu",
95
52
		"current_build_number":  "381",
96
53
	}
97
54
	endp := testibus.NewMultiValuedTestingEndpoint(nil, condition.Work(true), []interface{}{m})
98
45
	si := New(endp, s.log)
55
	si := New(endp, s.log)
100
46
	res, err := si.Info()
56
	res, err := si.Information()
101
47
	c.Assert(err, IsNil)
57
	c.Assert(err, IsNil)
102
48
	c.Check(res, DeepEquals, &InfoResult{
58
	c.Check(res, DeepEquals, &InfoResult{
108
49
		BuildNumber:   101,
59
		BuildNumber: 381,
109
50
		Device:        "mako",
60
		Device:      "mako",
110
51
		Channel:       "daily",
61
		Channel:     "ubuntu-touch/rc-proposed/ubuntu",
111
52
		LastUpdate:    "Unknown",
62
		LastUpdate:  "2016-03-04 15:25:31",
112
53
		VersionDetail: map[string]string{},
63
		VersionDetail: map[string]string{
113
64
			"ubuntu":  "20160304.2",
114
65
			"device":  "20160304.2",
115
66
			"custom":  "20160304.2",
116
67
			"version": "381",
117
68
		},
118
69
		Raw: m,
119
54
	})
70
	})
120
55
}
71
}
121
56
72
122
57
func (s *SISuite) TestFailsIfCallFails(c *C) {
73
func (s *SISuite) TestFailsIfCallFails(c *C) {
123
58
	endp := testibus.NewTestingEndpoint(nil, condition.Work(false))
74
	endp := testibus.NewTestingEndpoint(nil, condition.Work(false))
124
59
	si := New(endp, s.log)
75
	si := New(endp, s.log)
126
60
	_, err := si.Info()
76
	_, err := si.Information()
127
61
	c.Check(err, NotNil)
77
	c.Check(err, NotNil)
128
62
}
78
}
129
63
79
130
=== modified file 'client/client.go'
131
--- client/client.go	2015-09-30 14:44:14 +0000
132
+++ client/client.go	2016-03-10 13:15:52 +0000
133
@@ -292,7 +292,7 @@
134
292
	go cs.Track(client.connCh)
292
	go cs.Track(client.connCh)
135
293
	util.NewAutoRedialer(client.systemImageEndp).Redial()
293
	util.NewAutoRedialer(client.systemImageEndp).Redial()
136
294
	sysimg := systemimage.New(client.systemImageEndp, client.log)
294
	sysimg := systemimage.New(client.systemImageEndp, client.log)
138
295
	info, err := sysimg.Info()
295
	info, err := sysimg.Information()
139
296
	if err != nil {
296
	if err != nil {
140
297
		return err
297
		return err
141
298
	}
298
	}
142
299
299
143
=== modified file 'client/client_test.go'
144
--- client/client_test.go	2015-10-01 20:16:49 +0000
145
+++ client/client_test.go	2016-03-10 13:15:52 +0000
146
@@ -674,7 +674,16 @@
147
674
		dbus.ObjectPath("hello"),
674
		dbus.ObjectPath("hello"),
148
675
	)
675
	)
149
676
	siCond := condition.Fail2Work(2)
676
	siCond := condition.Fail2Work(2)
151
677
	siEndp := testibus.NewMultiValuedTestingEndpoint(siCond, condition.Work(true), []interface{}{int32(101), "mako", "daily", "Unknown", map[string]string{}})
677
	siEndp := testibus.NewMultiValuedTestingEndpoint(siCond, condition.Work(true), []interface{}{map[string]string{
152
678
		"version_detail":        "ubuntu=20160304.2,device=20160304.2,custom=20160304.2,version=381",
153
679
		"last_update_date":      "2016-03-04 15:25:31",
154
680
		"last_check_date":       "2016-03-08 04:30:34",
155
681
		"target_version_detail": "-1",
156
682
		"device_name":           "mako",
157
683
		"target_build_number":   "-1",
158
684
		"channel_name":          "ubuntu-touch/rc-proposed/ubuntu",
159
685
		"current_build_number":  "381",
160
686
	}})
161
678
	tickerCh := make(chan []interface{})
687
	tickerCh := make(chan []interface{})
162
679
	nopTickerCh := make(chan []interface{})
688
	nopTickerCh := make(chan []interface{})
163
680
	testibus.SetWatchSource(cEndp, "StateChanged", tickerCh)
689
	testibus.SetWatchSource(cEndp, "StateChanged", tickerCh)
Status:	Merged
Approved by:	Jonas G. Drange on 2016-03-10
Approved revision:	424
Merged at revision:	424
Proposed branch:	lp:~jonas-drange/ubuntu-push/lp1554547-automatic
Merge into:	lp:ubuntu-push/automatic
Diff against target:	163 lines (+76/-16) 4 files modified bus/systemimage/systemimage.go (+41/-6) bus/systemimage/systemimage_test.go (+24/-8) client/client.go (+1/-1) client/client_test.go (+10/-1)
To merge this branch:	bzr merge lp:~jonas-drange/ubuntu-push/lp1554547-automatic
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Jonas G. Drange (community)			Approve on 2016-03-09
Review via email: mp+288535@code.launchpad.net