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

Proposed by Jonas G. Drange on 2016-04-26
Status: Merged
Approved by: Jonas G. Drange on 2016-04-29
Approved revision: 427
Merged at revision: 426
Proposed branch: lp:~jonas-drange/ubuntu-push/state-State
Merge into: lp:ubuntu-push/automatic
Diff against target: 25 lines (+2/-2)
2 files modified
bus/connectivity/connectivity_test.go (+1/-1)
bus/networkmanager/networkmanager.go (+1/-1)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-push/state-State
Reviewer Review Type Date Requested Status
Simon Fels 2016-04-26 Approve on 2016-04-27
Review via email: mp+292946@code.launchpad.net

Commit message

rename “state” to “State” to match the NM spec

Description of the change

To post a comment you must log in.
Simon Fels (morphis) wrote :

LGTM

Simon Fels (morphis) :
review: Approve
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (34.9 MiB)

The attempt to merge lp:~jonas-drange/ubuntu-push/state-State into lp:ubuntu-push/automatic failed. Below is the output from the failed tests.

scripts/deps.sh server/dev/server.go
scripts/deps.sh server/acceptance/cmd/acceptanceclient.go
scripts/deps.sh ubuntu-push-client.go
/mnt/tarmac/cache/ubuntu-push-automatic/go-ws/bin/godeps -t launchpad.net/ubuntu-push launchpad.net/ubuntu-push/accounts launchpad.net/ubuntu-push/bus launchpad.net/ubuntu-push/bus/accounts launchpad.net/ubuntu-push/bus/connectivity launchpad.net/ubuntu-push/bus/emblemcounter launchpad.net/ubuntu-push/bus/haptic launchpad.net/ubuntu-push/bus/networkmanager launchpad.net/ubuntu-push/bus/notifications launchpad.net/ubuntu-push/bus/polld launchpad.net/ubuntu-push/bus/powerd launchpad.net/ubuntu-push/bus/systemimage launchpad.net/ubuntu-push/bus/testing launchpad.net/ubuntu-push/bus/unitygreeter launchpad.net/ubuntu-push/bus/urfkill launchpad.net/ubuntu-push/bus/windowstack launchpad.net/ubuntu-push/click launchpad.net/ubuntu-push/click/cappinfo launchpad.net/ubuntu-push/click/cblacklist launchpad.net/ubuntu-push/click/cclick launchpad.net/ubuntu-push/click/testing launchpad.net/ubuntu-push/client launchpad.net/ubuntu-push/client/gethosts launchpad.net/ubuntu-push/client/service launchpad.net/ubuntu-push/client/session launchpad.net/ubuntu-push/client/session/seenstate launchpad.net/ubuntu-push/config launchpad.net/ubuntu-push/external/murmur3 launchpad.net/ubuntu-push/identifier launchpad.net/ubuntu-push/identifier/testing launchpad.net/ubuntu-push/launch_helper launchpad.net/ubuntu-push/launch_helper/cual launchpad.net/ubuntu-push/launch_helper/helper_finder launchpad.net/ubuntu-push/launch_helper/legacy launchpad.net/ubuntu-push/logger launchpad.net/ubuntu-push/messaging launchpad.net/ubuntu-push/messaging/cmessaging launchpad.net/ubuntu-push/messaging/reply launchpad.net/ubuntu-push/nih launchpad.net/ubuntu-push/nih/cnih launchpad.net/ubuntu-push/poller launchpad.net/ubuntu-push/protocol launchpad.net/ubuntu-push/server launchpad.net/ubuntu-push/server/api launchpad.net/ubuntu-push/server/broker launchpad.net/ubuntu-push/server/broker/simple launchpad.net/ubuntu-push/server/broker/testing launchpad.net/ubuntu-push/server/broker/testsuite launchpad.net/ubuntu-push/server/dev launchpad.net/ubuntu-push/server/listener launchpad.net/ubuntu-push/server/session launchpad.net/ubuntu-push/server/store launchpad.net/ubuntu-push/sounds launchpad.net/ubuntu-push/testing launchpad.net/ubuntu-push/testing/condition launchpad.net/ubuntu-push/urldispatcher launchpad.net/ubuntu-push/urldispatcher/curldispatcher launchpad.net/ubuntu-push/util launchpad.net/ubuntu-push/ launchpad.net/ubuntu-push/server/acceptance/cmd/ launchpad.net/ubuntu-push/server/dev/ 2>/dev/null | cat > dependencies.tsv
rm -f -r /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/pkg
mkdir -p /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/bin
mkdir -p /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/pkg
go get -u launchpad.net/godeps
go get -d -u launchpad.net/gocheck launchpad.net/go-dbus/v1 launchpad.net/go-xdg/v0 code.google.com/p/gosqlite/sqlite3 code.google.com/p/go-uuid/uuid
/mnt/tarmac/cache/ubuntu-push-automatic/go-ws/...

427. By Jonas G. Drange on 2016-04-29

use correct prop name in connectivity test

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bus/connectivity/connectivity_test.go'
2--- bus/connectivity/connectivity_test.go 2015-04-29 15:17:49 +0000
3+++ bus/connectivity/connectivity_test.go 2016-04-29 12:31:02 +0000
4@@ -167,7 +167,7 @@
5
6 func (rep *racyEndpoint) GetProperty(prop string) (interface{}, error) {
7 switch prop {
8- case "state":
9+ case "State":
10 rep.lock.Lock()
11 defer rep.lock.Unlock()
12 rep.stateGot = true
13
14=== modified file 'bus/networkmanager/networkmanager.go'
15--- bus/networkmanager/networkmanager.go 2015-03-30 12:04:49 +0000
16+++ bus/networkmanager/networkmanager.go 2016-04-29 12:31:02 +0000
17@@ -76,7 +76,7 @@
18 */
19
20 func (nm *networkManager) GetState() State {
21- s, err := nm.bus.GetProperty("state")
22+ s, err := nm.bus.GetProperty("State")
23 if err != nil {
24 nm.log.Errorf("failed getting current state: %s", err)
25 nm.log.Debugf("defaulting state to Unknown")

Subscribers

People subscribed via source and target branches